1. 19 Jan, 2008 1 commit
  2. 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
  3. 09 Jan, 2008 5 commits
  4. 08 Jan, 2008 3 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
      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
  5. 07 Jan, 2008 1 commit
  6. 24 Dec, 2007 1 commit
    • unknown's avatar
      Fix for bug #33305: Test case in 'skip_grants' file need dynamic loading · bdad41ba
      unknown authored
                          to be compiled in
      
      The problem was that on a statically built server an attempt to create
      a UDF resulted in a different, but reasonable error ("Can't open shared
      library" instead of "UDFs are unavailable with the --skip-grant-tables
      option"), which caused a failure for the test case for bug #32020.
      
      Fixed by moving the test case for bug #32020 from skip_grants.test to a
      separate test to ensure that it is only run when the server is built
      with support for dynamically loaded libraries.
      
      
      mysql-test/r/skip_grants.result:
        Moved the test case for bug #32020 to a separate test.
      mysql-test/t/skip_grants.test:
        Moved the test case for bug #32020 to a separate test.
      mysql-test/r/udf_skip_grants.result:
        Moved the test case for bug #32020 to a separate test.
      mysql-test/t/udf_skip_grants-master.opt:
        Moved the test case for bug #32020 to a separate test.
      mysql-test/t/udf_skip_grants.test:
        Moved the test case for bug #32020 to a separate test.
      bdad41ba
  7. 21 Dec, 2007 7 commits
    • unknown's avatar
      Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt · baf5c2c1
      unknown authored
      into  linux-st28.site:/home/martin/mysql/src/bug32848/my51-bug32848
      
      
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/union.result:
        Bug#32848: Manual merge
      mysql-test/t/union.test:
        Bug#32848: Manual merge
      baf5c2c1
    • unknown's avatar
      Merge trift2.:/MySQL/M50/merge-5.0 · c8f6457f
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      netware/mysql_test_run.c:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      c8f6457f
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · df4e7698
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      df4e7698
    • unknown's avatar
      Merge trift2.:/MySQL/M50/clone-5.0 · c7eb461d
      unknown authored
      into  trift2.:/MySQL/M50/merge-5.0
      
      
      c7eb461d
    • unknown's avatar
      Bug #33256: CREATE ... SELECT creates obsolete table · 2ae4b047
      unknown authored
       w/ Field_date instead of Field_newdate
        
      Field_date was still used in temp table creation.
      Fixed by using Field_newdate consistently throughout the server
      except when reading tables defined with older MySQL version.
      No test suite is possible because both Field_date and Field_newdate
      return the same values in all the metadata calls. 
      
      
      mysql-test/r/type_decimal.result:
        Bug #33256: removed redundant warnings
      sql/field.h:
        Bug #33256: Add a constructor similar to Field_date::Field_date()
      sql/item.cc:
        Bug #33256: Use Field_newdate instead of Field_date 
        for all temp tables and CREATE .. SELECT
      sql/item_sum.cc:
        Bug #33256: Use Field_newdate instead of Field_date 
        for all temp tables and CREATE .. SELECT
      sql/item_timefunc.cc:
        Bug #33256: Use Field_newdate instead of Field_date 
        for all temp tables and CREATE .. SELECT
      sql/item_timefunc.h:
        Bug #33256: Use Field_newdate instead of Field_date 
        for all temp tables and CREATE .. SELECT
      2ae4b047
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · b54f4926
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      client/mysql.cc:
        Auto merged
      b54f4926
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-33288-33057 · 076d2522
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      076d2522
  8. 20 Dec, 2007 10 commits