1. 03 Apr, 2007 3 commits
  2. 02 Apr, 2007 1 commit
  3. 31 Mar, 2007 14 commits
  4. 30 Mar, 2007 22 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
      Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge · c310065c
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
      
      
      sql/mysqld.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      c310065c
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl · 206aab31
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
      
      
      client/Makefile.am:
        Auto merged
      mysql-test/r/rpl_ndb_basic.result:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      206aab31
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · f47c2328
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      sql/mysqld.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      f47c2328
    • 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 kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · ade8bbf4
      unknown authored
      into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
      
      
      ade8bbf4
    • unknown's avatar
      Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl · 3430da8e
      unknown authored
      into  four.local.lan:/WORK/mysql-5.1-rpl/src-rpl-ddlx
      
      
      3430da8e
    • 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
      This patch adds IF EXISTS to the drop of start_n_end to avoid a problem on · c3e420cf
      unknown authored
      some build machines during testing.
      
      
      mysql-test/t/events_scheduling.test:
        This patch alters result file to match the DROP IF EXISTS that was changed
        in the test.
      c3e420cf
    • unknown's avatar
      This patch includes modification to the rpl_events test to limit · e950594e
      unknown authored
      the SELECT in the test to only the expected rows. This helps
      eliminate the possibility of spurious rows causing the test to
      fail.
      
      
      mysql-test/r/rpl_events.result:
        This patch modifies the test results to match the new SELECT for test
        results.
      e950594e
    • unknown's avatar
      Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl · bfc73f2c
      unknown authored
      into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629_kostja
      
      
      bfc73f2c
    • unknown's avatar
      WL#3629 - Replication of Invocation and Invoked Features · c0b96432
      unknown authored
      This patch removes the SLAVESIDE_DISABLED token from the event status clause
      and adds the ability to mark an event as status = SLAVESIDE_DISABLED by using
      the syntax DISABLE ON SLAVE instead.
      
      The patch also adds tests to rpl_events to check the new syntax.
      
      
      mysql-test/include/rpl_events.inc:
        WL#3629 - Replication of Invocation and Invoked Features
        
        This patch adds tests to check the SQL syntax change from SLAVESIDE_DISABLED 
        to DISABLE ON SLAVE.
      mysql-test/r/rpl_events.result:
        WL#3629 - Replication of Invocation and Invoked Features
        
        This patch adds the results for the tests to check the SQL syntax change 
        from SLAVESIDE_DISABLED to DISABLE ON SLAVE.
      sql/lex.h:
        WL#3629 - Replication of Invocation and Invoked Features
        
        This patch removes the SLAVESIDE_DISABLED token.
      sql/sql_yacc.yy:
        WL#3629 - Replication of Invocation and Invoked Features
        
        This patch removes the SLAVESIDE_DISABLED token from the event status clause
        and adds the ability to mark an event as status = SLAVESIDE_DISABLED by using
        the syntax DISABLE ON SLAVE instead.
      c0b96432
    • 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 four.local.lan:/WORK/mysql-5.1-rpl/src-rpl-ddl · d5ea59f0
      unknown authored
      into  four.local.lan:/WORK/mysql-5.1-rpl/src-rpl-ddlx
      
      
      mysql-test/t/disabled.def:
        Auto merged
      d5ea59f0
    • unknown's avatar
      Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl · 6a0d5c01
      unknown authored
      into  romeo.(none):/home/bk/w3464-mysql-5.1-new-rpl
      
      
      6a0d5c01
    • unknown's avatar
      WL#3464 (Add replication event to denote gap in replication): · ccc65d8e
      unknown authored
      Fixing automerge problem and updating comments referring to exec_event().
      
      
      mysql-test/r/rpl_incident.result:
        Result change
      sql/log_event.cc:
        Renaming exec_event() to do_apply_event().
      sql/log_event.h:
        Renaming exec_event() to do_apply_event().
      sql/rpl_rli.cc:
        Fixing comments referring to exec_event(), which does not exist any more.
      sql/sql_class.h:
        Fixing comments referring to exec_event(), which does not exist any more.
      ccc65d8e
    • unknown's avatar
      Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · 89a21aba
      unknown authored
      into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
      
      
      89a21aba
    • unknown's avatar
      Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl · fbff3a5e
      unknown authored
      into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629_test
      
      
      fbff3a5e
    • unknown's avatar
      Patching tests to make them pass on all platforms. · 03b4cf51
      unknown authored
      
      mysql-test/include/rpl_udf.inc:
        Adding a replace on the slave side as well to make test pass on both
        Unix and Windows.
      mysql-test/r/rpl_udf.result:
        Result change
      03b4cf51