1. 30 May, 2005 1 commit
    • unknown's avatar
      olap.result, olap.test: · 5a548200
      unknown authored
        Added test cases for bug #7894.
      sql_select.cc:
        Fixed bug #7894: GROUP BY queries with ROLLUP returned
        wrong results for expressions containing group by columns.
        The fix ensured correct results by replacement of all
        occurrences of group by fields in non-aggregate expressions
        for corresponding ref objects and preventing creation of
        fields in temporary tables for expression containing group
        by fields.
      
      
      sql/sql_select.cc:
        Fixed bug #7894: GROUP BY queries with ROLLUP returned
        wrong results for expressions containing group by columns.
        The fix ensured correct results by replacement of all
        occurrences of group by fields in non-aggregate expressions
        for corresponding ref objects and preventing creation of
        fields in temporary tables for expression containing group
        by fields.
      mysql-test/t/olap.test:
        Added test cases for bug #7894.
      mysql-test/r/olap.result:
        Added test cases for bug #7894.
      5a548200
  2. 27 May, 2005 3 commits
  3. 26 May, 2005 10 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5f767b11
      unknown authored
      into neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      
      sql/item.cc:
        Auto merged
      5f767b11
    • unknown's avatar
      Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7c066496
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
      
      
      7c066496
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4a91ed13
      unknown authored
      into mysql.com:/M41/mysql-4.1
      
      
      4a91ed13
    • unknown's avatar
      merge · 60479953
      unknown authored
      
      sql/item.cc:
        Auto merged
      60479953
    • unknown's avatar
      fixed problem with long string results of expressions in UNIONS (BUG#10025) · 80b0baa7
      unknown authored
      
      mysql-test/r/union.result:
        test for Bug #10025
      mysql-test/t/union.test:
        test for Bug #10025
      sql/item.cc:
        set HA_OPTION_PACK_RECORD and change type to MYSQL_TYPE_STRING, to allow correct field creation in case of length more then 255 (creation STRING field with length more then 255)
      80b0baa7
    • unknown's avatar
      Merge hundin.mysql.fi:/home/marko/k/mysql-4.0 · 91427f24
      unknown authored
      into hundin.mysql.fi:/home/marko/mysql-4.1
      
      
      innobase/row/row0mysql.c:
        Auto merged
      91427f24
    • unknown's avatar
      InnoDB: Check all referencing tables in DROP DATABASE (Bug #10335). · 9181c17c
      unknown authored
      
      innobase/row/row0mysql.c:
        row_drop_table_for_mysql(): Check all referencing tables
        when drop_db==TRUE (Bug #10335)
      9181c17c
    • unknown's avatar
      Fix icc compiler warning · ab88a1d2
      unknown authored
      
      ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
        Removed second forward declaration of "struct DescEnt"
      ab88a1d2
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 7d7b5dbc
      unknown authored
      into neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      
      include/my_global.h:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      7d7b5dbc
    • unknown's avatar
      Add ifdefs to control when "#pragma implementation" should be used · 22944a95
      unknown authored
      Added some more ifdefs for "#pragma interface"
      
      
      client/sql_string.cc:
        USE_PRAGMA_IMPLEMENTATION
      client/sql_string.h:
        USE_PRAGMA_INTERFACE
      include/my_global.h:
        Use pragma implementation for gcc pre version 3
      mysys/raid.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/field.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/ha_berkeley.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/ha_blackhole.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/ha_heap.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/ha_innodb.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/ha_isam.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/ha_isammrg.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/ha_myisam.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/ha_myisammrg.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/ha_ndbcluster.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/handler.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/hash_filo.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/item.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/item_cmpfunc.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/item_func.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/item_geofunc.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/item_strfunc.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/item_subselect.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/item_sum.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/item_timefunc.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/item_uniq.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/item_uniq.h:
        USE_PRAGMA_INTERFACE
      sql/log_event.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/log_event.h:
        USE_PRAGMA_INTERFACE
      sql/opt_range.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/procedure.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/protocol.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/protocol_cursor.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/set_var.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/sql_analyse.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/sql_analyse.h:
        USE_PRAGMA_INTERFACE
      sql/sql_class.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/sql_crypt.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/sql_crypt.h:
        USE_PRAGMA_IMPLEMENTATION
      sql/sql_list.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/sql_map.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/sql_map.h:
        USE_PRAGMA_INTERFACE
      sql/sql_olap.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/sql_select.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/sql_string.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/sql_udf.cc:
        USE_PRAGMA_IMPLEMENTATION
      sql/tztime.cc:
        USE_PRAGMA_IMPLEMENTATION
      22944a95
  4. 25 May, 2005 7 commits
    • unknown's avatar
      Manual merge. · 7e5651ca
      unknown authored
      7e5651ca
    • unknown's avatar
      Added a missing "make clean" to the RPM "spec" file which had caused the... · ce11270f
      unknown authored
      Added a missing "make clean" to the RPM "spec" file which had caused the original 4.1.12 RPMs to be broken.
      (bug#10674, bug#10681)
      
      
      support-files/mysql.spec.sh:
        Added a missing "make clean" which had caused the original 4.1.12 RPMs to be broken.
        (bug#10674, bug#10681)
      ce11270f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · aa3a934b
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/sql_parse.cc:
        Auto merged
      aa3a934b
    • unknown's avatar
      Cleanup during code review · 549f56dc
      unknown authored
      Faster detection of wrong table names (like PRN) on windows
      
      
      include/my_sys.h:
        Added check_if_legal_filename()
      mysys/my_access.c:
        Added check_if_legal_filename()
        Set errno if my_access() fails
      mysys/my_fopen.c:
        USe check_if_legal_filename() instead of my_access() to detect wrong file names on windows
      mysys/my_open.c:
        USe check_if_legal_filename() instead of my_access() to detect wrong file names on windows
      sql/sql_lex.cc:
        Portability fix
      sql/sql_parse.cc:
        Simple cleanup
      sql/sql_repl.cc:
        Cleanup during code review
      549f56dc
    • unknown's avatar
      Use one err file for each master · 827db5e4
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        Add master id to end of MASTER_MY_ERR  so that both masters doesnt write to the same file.
      827db5e4
    • unknown's avatar
      BUG#10831 ndb mgmd LogDestination maxfiles does not rotate logs properly · 605f7061
      unknown authored
      
      ndb/src/common/util/File.cpp:
        my_stat returns NULL on failure, not non-zero.
        
        i.e. exactly the opposite of stat(2).
        
        providing confusion for unix programmers, who expect errors to be non-zero.
        
        Clean up File_class::exists(char*) to use the my_stat interface properly.
      605f7061
    • unknown's avatar
      BUG#10796 Incorrect check-cpu result for ppc linux gcc · 5b77d9b8
      unknown authored
      
      BUILD/check-cpu:
        Add no_march variable to indicate that this architecture doesn't support the -march flag to GCC
      5b77d9b8
  5. 24 May, 2005 12 commits
  6. 23 May, 2005 7 commits