1. 02 Apr, 2007 6 commits
  2. 31 Mar, 2007 2 commits
  3. 30 Mar, 2007 14 commits
    • unknown's avatar
      Merge mysql.com:/home/psergey/bk-trees/mysql-5.0-opt · fd4dbbf5
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.1-merge2
      
      
      mysql-test/r/range.result:
        Auto merged
      mysql-test/t/range.test:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      fd4dbbf5
    • unknown's avatar
      item.cc, insert_update.result: · f92433ae
      unknown authored
        After merge fix.
      
      
      mysql-test/r/insert_update.result:
        After merge fix.
      sql/item.cc:
        After merge fix.
      f92433ae
    • unknown's avatar
      Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt · da11d817
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
      
      
      mysql-test/r/func_gconcat.result:
        Auto merged
      mysql-test/r/insert_update.result:
        Auto merged
      mysql-test/r/subselect3.result:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      mysql-test/t/insert_update.test:
        Auto merged
      sql/field_conv.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.h:
        Auto merged
      mysql-test/r/gis.result:
        Manual merge
      mysql-test/t/gis.test:
        Manual merge
      sql/handler.cc:
        Manual merge
      sql/item_sum.cc:
        Manual merge
      sql/sql_insert.cc:
        Manual merge
      sql/sql_table.cc:
        Manual merge
      da11d817
    • unknown's avatar
      BUG#26624, pushbuild fixes: Merge to 5.0 · 2016b21c
      unknown authored
      
      mysql-test/r/range.result:
        Auto merged
      mysql-test/t/range.test:
        Auto merged
      2016b21c
    • unknown's avatar
      BUG#26624: high mem usage (crash) in range optimizer · 080c0c7a
      unknown authored
      Pushbuild fixes: 
       - Make MAX_SEL_ARGS smaller (even 16K records_in_range() calls is 
         more than it makes sense to do in typical cases)
       - Don't call sel_arg->test_use_count() if we've already allocated 
         more than MAX_SEL_ARGs elements. The test will succeed but will take
         too much time for the test suite (and not provide much value).
      
      
      mysql-test/r/range.result:
        BUG#26624: high mem usage (crash) in range optimizer
        Pushbuild fixes: make the test go faster
      mysql-test/t/range.test:
        BUG#26624: high mem usage (crash) in range optimizer
        Pushbuild fixes: make the test go faster
      080c0c7a
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 7e1e2280
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
      
      
      sql/mysqld.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      7e1e2280
    • unknown's avatar
      Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the · 86a0ffdd
      unknown authored
      NO_AUTO_VALUE_ON_ZERO mode.
      
      In the NO_AUTO_VALUE_ON_ZERO mode the table->auto_increment_field_not_null
      variable is used to indicate that a non-NULL value was specified by the user
      for an auto_increment column. When an INSERT .. ON DUPLICATE updates the
      auto_increment field this variable is set to true and stays unchanged for the
      next insert operation. This makes the next inserted row sometimes wrongly have
      0 as the value of the auto_increment field.
      
      Now the fill_record() function resets the table->auto_increment_field_not_null
      variable before filling the record.
      The table->auto_increment_field_not_null variable is also reset by the
      open_table() function for a case if we missed some auto_increment_field_not_null
      handling bug.
      Now the table->auto_increment_field_not_null is reset at the end of the
      mysql_load() function.
      
      Reset the table->auto_increment_field_not_null variable after each
      write_row() call in the copy_data_between_tables() function.
      
      
      
      
      sql/field_conv.cc:
        Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the 
        NO_AUTO_VALUE_ON_ZERO mode.
        A comment is corrected.
      sql/handler.cc:
        Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the 
        NO_AUTO_VALUE_ON_ZERO mode.
        Now the handler::update_auto_increment() function doesn't reset the
        table->auto_increment_field_not_null variable as it is done in the
        fill_record() function.
      sql/sql_base.cc:
        Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the 
        NO_AUTO_VALUE_ON_ZERO mode.
        Now the fill_record() function resets the table->auto_increment_field_not_null
        variable before filling the record.
        The table->auto_increment_field_not_null variable is also reset by the
        open_table() function for a case if we missed some auto_increment_field_not_null
        handling bug.
      sql/sql_insert.cc:
        Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the
        NO_AUTO_VALUE_ON_ZERO mode.
        Now the the table->auto_increment_field_not_null is reset at the end of the
        mysql_insert() an in the select_insert class destructor.
      sql/sql_load.cc:
        Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the 
        NO_AUTO_VALUE_ON_ZERO mode.
        Now the table->auto_increment_field_not_null is reset at the end of the
        mysql_load() function.
      sql/sql_table.cc:
        Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the
        NO_AUTO_VALUE_ON_ZERO mode.
        Reset the table->auto_increment_field_not_null variable after each
        write_row() call in the copy_data_between_tables() function.
      sql/table.h:
        Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the
        NO_AUTO_VALUE_ON_ZERO mode.
        A comment added.
      mysql-test/r/insert_update.result:
        Added the test case for the bug#23233: 0 as LAST_INSERT_ID() after
        INSERT .. ON DUPLICATE in the NO_AUTO_VALUE_ON_ZERO mode.
      mysql-test/t/insert_update.test:
        Added the test case for the bug#23233: 0 as LAST_INSERT_ID() after
        INSERT .. ON DUPLICATE in the NO_AUTO_VALUE_ON_ZERO mode.
      86a0ffdd
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-axmrg · cf465f7e
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      cf465f7e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 0db1a148
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      0db1a148
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · fe8c67ef
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      fe8c67ef
    • unknown's avatar
      Post merge fix · a2139d02
      unknown authored
      a2139d02
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 1d3d4d0d
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      1d3d4d0d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 644316ed
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      include/my_pthread.h:
        Auto merged
      include/thr_alarm.h:
        Auto merged
      mysys/my_pthread.c:
        Auto merged
      mysys/thr_alarm.c:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/stacktrace.c:
        Auto merged
      sql/stacktrace.h:
        Auto merged
      mysys/my_thr_init.c:
        Manual merge
      644316ed
  4. 29 Mar, 2007 18 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 3c9b911d
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      3c9b911d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 29741b71
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      29741b71
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.0-engines · ab35839a
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.1-engines
      
      
      mysys/my_redel.c:
        Auto merged
      ab35839a
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · db2236be
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      db2236be
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 817a474c
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.0-engines
      
      
      817a474c
    • unknown's avatar
      Bug #27529: Slave crashes on lots of updates · a304bcac
      unknown authored
      - do not try to perge binlog when purge comes from slave, it never purges binlog anyways
      
      
      a304bcac
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 4430048e
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B26815-5.0-opt
      
      
      sql/item_sum.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      4430048e
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/B26815-5.0-opt · 456cc52e
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B26815-5.0-opt
      
      
      mysql-test/r/func_gconcat.result:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      456cc52e
    • unknown's avatar
      Bug #26815: · 40c1a3f9
      unknown authored
       When creating a temporary table the concise column type
       of a string expression is decided based on its length:
       - if its length is under 512 it is stored as either 
         varchar or char.
       - otherwise it is stored as a BLOB.
       
       There is a flag (convert_blob_length) to create_tmp_field 
       that, when >0 allows to force creation of a varchar if the
       max blob length is under convert_blob_length.
       However it must be verified that convert_blob_length 
       (settable through a SQL option in some cases) is 
       under the maximum that can be stored in a varchar column.
       While performing that check for expressions in 
       create_tmp_field_from_item the max length of the blob was
       used instead. This causes blob columns to be created in the
       heap temp table used by GROUP_CONCAT (where blobs must not
       be created in the temp table because of the constant 
       convert_blob_length that is passed to create_tmp_field() ).
       And since these blob columns are not expected in that place
       we get wrong results.
       Fixed by checking that the value of the flag variable is 
       in the limits that fit into VARCHAR instead of the max length
       of the blob column.
      
      
      mysql-test/r/func_gconcat.result:
        Bug #26815: test case
      mysql-test/t/func_gconcat.test:
        Bug #26815: test case
      sql/item_sum.cc:
        Bug #26815: wrong length was checked
      sql/sql_select.cc:
        Bug #26815: wrong length was checked
      40c1a3f9
    • unknown's avatar
      Fix compiler warnings · cc88dd89
      unknown authored
      
      sql/mysqld.cc:
        Fix compiler warning
      sql/stacktrace.c:
        Fix compiler warning
      cc88dd89
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 6751cb25
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      6751cb25
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 8122b0ca
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
      
      
      8122b0ca
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 8f39ffe3
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      mysql-test/r/ndb_single_user.result:
        manual merge
      8f39ffe3
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 45d22e80
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      45d22e80
    • unknown's avatar
      Bug #27378 update becomes delete on slave · 2c8ef7c4
      unknown authored
       - quick workaround, better patch is needed later
       - test case
      
      
      mysql-test/r/rpl_ndb_basic.result:
        Bug #27378 update becomes delete on slave
         - test case
      mysql-test/t/rpl_ndb_basic.test:
        Bug #27378 update becomes delete on slave
         - test case
      sql/ha_ndbcluster.cc:
        Bug #27378 update becomes delete on slave
         - quick workaround, better patch is needed later
      2c8ef7c4
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · ce0e7e6d
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Auto merged
      ce0e7e6d
    • unknown's avatar
      Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory · 686842b9
      unknown authored
      - also run this patch on 32 bit machines to allow online upgrade
      
      
      686842b9
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · 0b0de297
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
        Auto merged
      0b0de297