1. 22 Jan, 2008 2 commits
  2. 21 Jan, 2008 6 commits
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 77fc8ad5
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      77fc8ad5
    • unknown's avatar
      Merge trift2.:/MySQL/M41/push-4.1 · 09be3816
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      09be3816
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · dd2317f9
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      dd2317f9
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · dfe7b382
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      dfe7b382
    • unknown's avatar
      Merge trift2.:/MySQL/M41/mysql-4.1 · b7b1bd62
      unknown authored
      into  trift2.:/MySQL/M41/push-4.1
      
      
      b7b1bd62
    • unknown's avatar
      New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns... · 63c73b52
      unknown authored
      New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
      Added new tests and corrected existing tests
      
      
      mysql-test/suite/stress/include/ddl3.inc:
        New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
        
        Had to change CREATE TABLE statements to include NOT NULL due to CSV engine constraints
      mysql-test/suite/stress/r/ddl_archive.result:
        New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
        
        Reproduced .result files due to changes in ddl3.inc
      mysql-test/suite/stress/r/ddl_csv.result:
        New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
        
        Reproduced .result files due to changes in ddl3.inc
      mysql-test/suite/stress/r/ddl_innodb.result:
        New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
        
        Reproduced .result files due to changes in ddl3.inc
      mysql-test/suite/stress/r/ddl_memory.result:
        New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
        
        Reproduced .result files due to changes in ddl3.inc
      mysql-test/suite/stress/r/ddl_myisam.result:
        New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
        
        Reproduced .result files due to changes in ddl3.inc
      mysql-test/suite/stress/r/ddl_ndb.result:
        New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
        
        Reproduced .result files due to changes in ddl3.inc
      BitKeeper/etc/ignore:
        Added mysql-test/.DS_Store .DS_Store to the ignore list
      mysql-test/t/disabled.def:
        Disabled new test - csv_alter_table.test file due to Bug#33696.
        
        Cannot generate a .result file due to the Bug.  These tests can be enabled to test the bug fix without needing new tests unless the developer feels the need to add more.
      mysql-test/r/csv_not_null.result:
        New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
      mysql-test/t/csv_alter_table.test:
        New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
        
        Designed to test fixes for Bug#33696 - CSV Engine allows nullable columns via ALTER TABLE statements
      mysql-test/t/csv_not_null.test:
        New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
      63c73b52
  3. 19 Jan, 2008 1 commit
  4. 10 Jan, 2008 12 commits
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 8a757010
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      client/mysql.cc:
        Auto merged
      8a757010
    • unknown's avatar
      Merge kaamos.(none):/data/src/mysql-5.1 · 824ced46
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      client/mysql.cc:
        Auto merged
      client/mysqltest.c:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      824ced46
    • unknown's avatar
      Merge kaamos.(none):/data/src/mysql-5.0 · 84762ce2
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.0-opt
      
      
      client/mysql.cc:
        Auto merged
      84762ce2
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt · cd6dc10c
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
      
      
      sql/filesort.cc:
        Auto merged
      cd6dc10c
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · eb80c468
      unknown authored
      into  moonbone.local:/work/33675-bug-5.0-opt-mysql
      
      
      eb80c468
    • unknown's avatar
      filesort.cc: · 1a8bcceb
      unknown authored
        Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
        server crash.
        Free smaller buffer before allocating bigger one.
      
      
      sql/filesort.cc:
        Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
        server crash.
        Free smaller buffer before allocating bigger one.
      1a8bcceb
    • unknown's avatar
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 1040bea9
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      sql/field.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      mysql-test/r/subselect.result:
        Manual merge.
      mysql-test/t/subselect.test:
        Manual merge.
      sql/filesort.cc:
        Manual merge.
      1040bea9
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/mysql-4.1-opt · dafd3f43
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.0-opt
      
      
      sql/set_var.cc:
        Auto merged
      dafd3f43
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/bug33305/my51-bug33305 · 3869d363
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      mysql-test/r/union.result:
        Auto merged
      mysql-test/t/union.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      3869d363
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/bug33305/my50-bug33305 · 7085583c
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.0-opt
      
      
      7085583c
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/bug33305/my50-bug33305 · 10909bf4
      unknown authored
      into  kaamos.(none):/data/src/opt/bug33305/my51-bug33305
      
      
      mysql-test/r/cast.result:
        Auto merged
      mysql-test/r/type_date.result:
        Auto merged
      mysql-test/r/union.result:
        Auto merged
      mysql-test/t/cast.test:
        Auto merged
      mysql-test/t/skip_grants.test:
        Auto merged
      mysql-test/t/type_date.test:
        Auto merged
      mysql-test/t/union.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/skip_grants.result:
        Manual merge.
      10909bf4
  5. 09 Jan, 2008 7 commits
  6. 08 Jan, 2008 4 commits
    • unknown's avatar
      Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused · 8845553a
      unknown authored
      server crash.
      
      The filesort implementation has an optimization for subquery execution which
      consists of reusing previously allocated buffers. In particular the call to
      the read_buffpek_from_file function might be skipped when a big enough buffer
      for buffer descriptors (buffpeks) is already allocated. Beside allocating
      memory for buffpeks this function fills allocated buffer with data read from
      disk. Skipping it might led to using an arbitrary memory as fields' data and
      finally to a crash.
      
      Now the read_buffpek_from_file function is always called. It allocates
      new buffer only when necessary, but always fill it with correct data.
      
      
      sql/filesort.cc:
        Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
        server crash.Now the read_buffpek_from_file function is always called. It allocates
        new buffer only when necessary, but always fill it with correct data.
      mysql-test/r/subselect.result:
        Added a test case for the bug#33675: Usage of an uninitialized memory by
        filesort in a subquery caused server crash.
      mysql-test/t/subselect.test:
        Added a test case for the bug#33675: Usage of an uninitialized memory by
        filesort in a subquery caused server crash.
      8845553a
    • unknown's avatar
      WL#4084: Code changes due to enabled the disabled tests (including other improvements). · 68eb3c94
      unknown authored
      
      BitKeeper/etc/ignore:
        Added mysql-test/funcs_1.log to the ignore list
      68eb3c94
    • unknown's avatar
      merge of bug 33256 5.0-opt -> 5.1-opt · 34cae156
      unknown authored
      34cae156
    • unknown's avatar
      Merge macbook.gmz:/Users/kgeorge/mysql/work/B33256-5.0-opt · c82a7b94
      unknown authored
      into  macbook.gmz:/Users/kgeorge/mysql/work/B33256-5.1-opt
      
      
      mysql-test/r/union.result:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/type_decimal.result:
        merge of bug 33256 5.0-opt -> 5.1-opt
      mysql-test/t/union.test:
        merge of bug 33256 5.0-opt -> 5.1-opt
      sql/field.h:
        merge of bug 33256 5.0-opt -> 5.1-opt
      sql/item.cc:
        merge of bug 33256 5.0-opt -> 5.1-opt
      sql/item_sum.cc:
        merge of bug 33256 5.0-opt -> 5.1-opt
      sql/item_timefunc.cc:
        merge of bug 33256 5.0-opt -> 5.1-opt
      sql/item_timefunc.h:
        merge of bug 33256 5.0-opt -> 5.1-opt
      c82a7b94
  7. 07 Jan, 2008 1 commit
  8. 02 Jan, 2008 1 commit
  9. 28 Dec, 2007 6 commits