1. 14 Jul, 2006 3 commits
    • unknown's avatar
      Fix information_schema.result after a manual merge. · fc6dcff5
      unknown authored
      
      mysql-test/r/information_schema.result:
        Post-merge fixes.
      fc6dcff5
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/tmp_merge · 5677612a
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
      
      
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/sp-vars.result:
        Auto merged
      mysql-test/t/func_sapdb.test:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      sql/field_conv.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      mysql-test/r/information_schema.result:
        Use local
      mysql-test/t/information_schema.test:
        Manual merge.
      sql/sql_lex.h:
        Manual merge.
      5677612a
    • unknown's avatar
      Merge mysql.com:/home/psergey/tmp_merge-2 · 906cd90d
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.1-merge-2
      
      
      mysql-test/r/range.result:
        Auto merged
      mysql-test/t/range.test:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      906cd90d
  2. 13 Jul, 2006 6 commits
    • unknown's avatar
      Post-merge fixes. · 3657f346
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        A post-merge fix (apply a change lost during the merge).
      sql/ha_ndbcluster.cc:
        A post-merge fix: resolve a merge error.
      sql/item.cc:
        Fix a merge error.
      sql/item_xmlfunc.cc:
        Use the new signature of agg_arg_charsets.
      3657f346
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/tmp_merge · 3c3f9d90
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/deleted/.del-mysqld_safe-watch.sh~37cbc9a97ffd2555:
        Auto merged
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/key.result:
        Auto merged
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/func_sapdb.test:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/key.test:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysys/my_handler.c:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      storage/heap/hp_test1.c:
        Auto merged
      storage/heap/hp_test2.c:
        Auto merged
      strings/ctype-mb.c:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      sql/table.cc:
        Use local (manual merge)
      mysql-test/mysql-test-run.sh:
        Manual merge.
      sql/ha_ndbcluster.cc:
        Manual merge.
      sql/item.cc:
        Manual merge.
      tests/mysql_client_test.c:
        Manual merge.
      3c3f9d90
    • unknown's avatar
      Merge trift2.:/M50/tmp_merge2 · 5e643e31
      unknown authored
      into  trift2.:/M51/merge-5.1
      
      
      include/my_sys.h:
        Auto merged
      mysql-test/r/federated.result:
        Auto merged
      mysql-test/t/federated.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      5e643e31
    • unknown's avatar
      Merge trift2.:/M50/tmp_merge1 · 0293b84a
      unknown authored
      into  trift2.:/M51/merge-5.1
      
      
      configure.in:
        Null merge - the 5.0 version number does not propagate into 5.1
      0293b84a
    • unknown's avatar
      Post-merge fixes. · b1d1ea57
      unknown authored
      
      mysql-test/r/federated.result:
        A post-merge fix.
      mysql-test/r/show_check.result:
        A post-merge fix.
      sql/log_event.cc:
        Remove rewrite_db (it's refactored in 5.1 to rpl_filter)
      sql/share/errmsg.txt:
        Move ER_NO_TRIGGERS_ON_SYSTEM_SCHEMA to the end of the list.
        This breaks compatibility of errmsg.sys with 5.0 but preserves 
        compatibility with 5.1.11.
      sql/sql_class.h:
        A post-merge fix.
      b1d1ea57
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/tmp_merge · d013f9e5
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
      
      
      include/my_sys.h:
        Auto merged
      mysql-test/r/auto_increment.result:
        Auto merged
      mysql-test/r/func_math.result:
        Auto merged
      mysql-test/r/func_system.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/r/type_blob.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      sql/slave.h:
        SCCS merged
      mysql-test/r/show_check.result:
        Manual merge.
      mysql-test/t/show_check.test:
        Manual merge.
      sql/log_event.cc:
        Manual merge.
      sql/share/errmsg.txt:
        Manual merge.
      sql/sql_class.h:
        Manual merge.
      sql/sql_db.cc:
        Manual merge.
      d013f9e5
  3. 12 Jul, 2006 4 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 26f0d13d
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/r/federated.result:
        Manual merge.
      mysql-test/t/federated.test:
        Manual merge.
      sql/sql_insert.cc:
        Manual merge.
      26f0d13d
    • unknown's avatar
      Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1 · fe4ed244
      unknown authored
      into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.1-new-rpl
      
      
      sql/ha_federated.cc:
        Auto merged
      fe4ed244
    • unknown's avatar
      Merge dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.0-rpl · 22b51e25
      unknown authored
      into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.1-new-rpl
      
      
      storage/ndb/include/kernel/GlobalSignalNumbers.h:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndberror.c:
        Auto merged
      22b51e25
    • unknown's avatar
      Post-merge fixes for mysql-5.1-new-rpl · 9a111f5c
      unknown authored
      
      mysql-test/r/rpl_switch_stm_row_mixed.result:
        Result change
      sql/sql_class.h:
        Post-merge fixes.
      9a111f5c
  4. 11 Jul, 2006 5 commits
    • unknown's avatar
      Merge trift2.:/M50/tmp_merge · 2e20c5b0
      unknown authored
      into  trift2.:/M51/merge-5.1
      
      
      mysql-test/r/federated.result:
        Auto merged
      mysql-test/t/federated.test:
        Auto merged
      2e20c5b0
    • unknown's avatar
      Merge trift2.:/M50/tmp_merge · 6e053cc3
      unknown authored
      into  trift2.:/M51/merge-5.1
      
      
      configure.in:
        Auto merged
      mysql-test/t/federated.test:
        Auto merged
      sql/ha_federated.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      mysql-test/r/federated.result:
        SCCS merged
      sql/ha_federated.h:
        ?
        ?
        Use local.
      6e053cc3
    • unknown's avatar
      Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1-new-rpl · c22a8981
      unknown authored
      into  dl145k.mysql.com:/data0/mkindahl/bk/MERGE/mysql-5.1-merge
      
      
      include/my_sys.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/rpl_row_create_table.result:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      mysql-test/t/rpl_row_create_table.test:
        Auto merged
      mysys/my_malloc.c:
        Auto merged
      server-tools/instance-manager/parse.h:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysys/safemalloc.c:
        Merge of mysql-5.1-new-rpl into mysql-5.1
      sql/ha_federated.cc:
        d
        Merge of mysql-5.1-new-rpl into mysql-5.1
      sql/set_var.cc:
        Merge of mysql-5.1-new-rpl with mysql-5.1
      sql/slave.cc:
        Merge of mysql-5.1-new-rpl into mysql-5.1
      sql/sql_class.h:
        Merge of mysql-5.1-new-rpl into mysql-5.1
      c22a8981
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.1 · e8f8fd8d
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-amerge
      
      
      e8f8fd8d
    • unknown's avatar
      Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.0-rpl · fabab792
      unknown authored
      into  dl145k.mysql.com:/data0/mkindahl/bk/MERGE/mysql-5.0-merge
      
      
      ndb/include/kernel/GlobalSignalNumbers.h:
        Auto merged
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/ndbapi/ndberror.c:
        Auto merged
      fabab792
  5. 10 Jul, 2006 16 commits
    • unknown's avatar
      Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge · a6edf110
      unknown authored
      into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
      
      
      libmysqld/lib_sql.cc:
        Auto merged
      libmysqld/libmysqld.c:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/gis.result:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/r/sp-security.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/gis.test:
        Auto merged
      mysql-test/t/sp-security.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_geofunc.h:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      storage/ndb/include/kernel/GlobalSignalNumbers.h:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Auto merged
      mysql-test/t/mysqldump.test:
        Manual merge.  (Seems to need null-merging.)
      sql/mysqld.cc:
        Manual merge + formatting change.
      sql/sql_show.cc:
        Manual merge
      a6edf110
    • unknown's avatar
      4b6e8fa6
    • unknown's avatar
      Merge andrepl.(none):/home/elkin/MySQL/TEAM/BARE/5.1 · e8f1a99a
      unknown authored
      into  andrepl.(none):/home/elkin/MySQL/TEAM/FIXES/5.1/20919_temp_nlog
      
      
      mysql-test/t/rpl_openssl.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      e8f1a99a
    • unknown's avatar
      fixes after merge. Updates to test's results. · 20c59f9c
      unknown authored
      We now reset the THD members related to auto_increment+binlog in
      MYSQL_LOG::write(). This is better than in THD::cleanup_after_query(),
      which was not able to distinguish between SELECT myfunc1(),myfunc2()
      and INSERT INTO t SELECT myfunc1(),myfunc2() from a binlogging point
      of view.
      Rows_log_event::exec_event() now calls lex_start() instead of
      mysql_init_query() because the latter now does too much (it resets
      the binlog format).
      
      
      mysql-test/extra/rpl_tests/rpl_insert_id.test:
        fix after merge
      mysql-test/mysql-test-run.pl:
        -v does not bring useful information when running valgrind; I remove it;
        if you think it's useful add it back.
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Position columns of SHOW BINLOG EVENTS are replaced by # (more robust
        if the size of an event changes).
      mysql-test/r/rpl_insert_id.result:
        fix after merge
      mysql-test/r/rpl_loaddata.result:
        The binlog positions change, because one event disappeared; indeed there
        was this in the binlog (in the current 5.1!):
        SET INSERT_ID=2;
        SET INSERT_ID=1;
        SET TIMESTAMP=1152540671;
        load data LOCAL INFILE '/tmp/SQL_LOAD_MB-1-2' INTO table t1;
        Two INSERT_ID events, useless and a bug. Goes away afer cleaning up
        auto_increment handling.
      mysql-test/r/rpl_switch_stm_row_mixed.result:
        INSERT_ID=5 appears, it's a consequence of having merged the fix
        for BUG#20341
        "stored function inserting into one auto_increment puts bad data in slave".
        In mixed mode, if one substatement of a stored procedure requires row-based,
        the entire procedure uses row-based (was already true for stored functions);
        this is a consequence of not doing the resetting of binlog format inside
        lock_tables() (which didn't work with how the slave thread executes
        row-based binlog events).
      mysql-test/t/rpl_switch_stm_row_mixed.test:
        removing the multi-row delayed insert because in RBR the number of events
        which it generates, is not repeatable (probably depends on how the delayed
        thread groups rows, i.e. dependent on timing).
      sql/ha_partition.cc:
        update to new prototype
      sql/ha_partition.h:
        update to new prototype of the handler:: method.
      sql/handler.cc:
        after-merge fixes (manually merging part which was hard to merge in fmtool)
      sql/log.cc:
        When we write to the binary log, THD's parameters which influenced this
        write are reset: stmt_depends_on_first_successful_insert_id_in_prev_stmt
        and auto_inc_intervals_in_cur_stmt_for_binlog. This is so that future
        writes are not influenced by those and can write their own values.
        As a consequence, when we don't write to the binlog we do not reset.
        This is to abide by the rule that in a complex statement (using triggers etc),
        the first top- or substatement to generate auto_increment ids
        wins their writing to the binlog (that writing may be done by the statement
        itself or by the caller); so for example for
        INSERT INTO t SELECT myfunc() where myfunc() inserts into auto_increment
        and INSERT INTO t does not, myfunc() will fill
        auto_inc_intervals_in_cur_stmt_for_binlog, which will not be reset when
        myfunc() ends, then INSERT INTO t will write to the binlog and thus
        write the preserved auto_inc_intervals_in_cur_stmt_for_binlog.
      sql/log_event.cc:
        mysql_init_query() does too much now to be called in Rows_log_event::exec_event
        (it call mysql_reset_thd_for_next_command() which may switch
        the binlog format now).
        It's ok to call it in Table_map_log_event::exec_event() but its call must
        be before setting the binlog format to "row".
      sql/sql_base.cc:
        Resetting the binlog format in lock_tables() was a bad idea of mine;
        it causes problems in execution of row-based binlog events, where
        the thread sets the binlog format by itself and does not want a next
        lock_tables() to reset the binlog format.
        It is also misleading, for a function named lock_tables(), to reset
        the binlog format.
        As a consequence of this change, in mixed binlogging mode, a routine
        is logged either entirely statement-based or entirely row-based, we
        don't switch in the middle (this was already true for prelocked routines,
        now it's also true for stored procedures).
      sql/sql_class.cc:
        resetting of auto_increment variables used for binlogging is now done
        when writing to the binary log, no need to do the resetting at the end
        of the statement. It is also more correct this way; consider
        SELECT myfunc1(),myfunc2();
        where both functions insert into the same auto_increment column.
        Binlogging is done in 2 events: "SELECT myfunc1()" and "SELECT myfunc2()".
        So each of those needs to have, in binlog, the INSERT_ID which
        it inserted. But as the 2 function calls are executed under prelocked mode,
        the old code didn't reset auto_inc_intervals_in_cur_stmt_for_binlog
        after the first SELECT was binlogged, and so the INSERT_ID of the first
        SELECT was binlogged for the first SELECT and (wrong) also for the 2nd
        SELECT event.
        stmt_depends_on_first_... has the same logic.
      sql/sql_class.h:
        clearer comment
      sql/sql_delete.cc:
        unneeded #ifdef. As we temporarily change the binlog format to "statement"
        before calling mysql_delete(), we must restore it afterwards.
      sql/sql_insert.cc:
        after-merge fixes.
        No need to reset auto_inc_intervals_in_cur_stmt_for_binlog for every
        row in the delayed insert system thread, because we already reset it
        when writing to the binlog.
      sql/sql_parse.cc:
        unneeded #ifdef
      20c59f9c
    • unknown's avatar
      Merge andrepl.(none):/net/koti/usr_rh9/home/elkin.rh9/MySQL/TEAM/BARE/5.0 · 950f95e3
      unknown authored
      into  andrepl.(none):/home/elkin/MySQL/TEAM/FIXES/5.1/20919_temp_nlog
      
      
      mysql-test/t/rpl_openssl.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/sql_base.cc:
        manual merge
      950f95e3
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 4ce8ca64
      unknown authored
      into  gbichot3.local:/home/mysql_src/mysql-5.0
      
      
      4ce8ca64
    • unknown's avatar
      ndb - debug stuff in LQH · 8154ca61
      unknown authored
      
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        dont mess up signal log, also changed w+ to a
      8154ca61
    • unknown's avatar
      Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2 · c1d9764c
      unknown authored
      into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug18781
      
      
      storage/ndb/src/kernel/blocks/dbdict/DictLock.txt:
        SCCS merged
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        manual
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        SCCS merged
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
        manual
      storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
        manual
      storage/ndb/test/run-test/daily-basic-tests.txt:
        SCCS merged
      c1d9764c
    • unknown's avatar
      ndb - bug#18781: close a tiny window (re-commit, try to by-pass merge jam) · 001c7f5f
      unknown authored
      
      ndb/src/kernel/blocks/dbdict/DictLock.txt:
        wait until SL_STARTED before sending DICT_UNLOCK_ORD
      ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        wait until SL_STARTED before sending DICT_UNLOCK_ORD
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        wait until SL_STARTED before sending DICT_UNLOCK_ORD
      ndb/src/kernel/vm/SimulatedBlock.cpp:
        wait until SL_STARTED before sending DICT_UNLOCK_ORD
      ndb/src/kernel/vm/SimulatedBlock.hpp:
        wait until SL_STARTED before sending DICT_UNLOCK_ORD
      ndb/test/run-test/daily-basic-tests.txt:
        wait until SL_STARTED before sending DICT_UNLOCK_ORD
      001c7f5f
    • unknown's avatar
      Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2 · 3a12a1a9
      unknown authored
      into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug18781
      
      
      storage/ndb/include/kernel/GlobalSignalNumbers.h:
        auto
      storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
        SCCS merged
      storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        auto
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
        auto
      storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
        manual
      3a12a1a9
    • unknown's avatar
      ndb - bug#18781 : 5.0 : add NODE_START_REP from 5.1 (re-commit, try to by-pass merge jam) · f98f5d63
      unknown authored
      
      ndb/include/kernel/GlobalSignalNumbers.h:
        5.0 : add NODE_START_REP from 5.1
      ndb/src/common/debugger/signaldata/SignalNames.cpp:
        5.0 : add NODE_START_REP from 5.1
      ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        5.0 : add NODE_START_REP from 5.1
      ndb/src/kernel/vm/SimulatedBlock.cpp:
        5.0 : add NODE_START_REP from 5.1
      ndb/src/kernel/vm/SimulatedBlock.hpp:
        5.0 : add NODE_START_REP from 5.1
      f98f5d63
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl · 3a3a5622
      unknown authored
      into  gbichot3.local:/home/mysql_src/mysql-5.1
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      3a3a5622
    • unknown's avatar
      Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl · 45f56813
      unknown authored
      into  romeo.(none):/home/bk/b20821-mysql-5.1-new-rpl
      
      
      45f56813
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.1-amerge · de02f176
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-aid
      
      
      sql/ha_federated.cc:
        Auto merged
      de02f176
    • unknown's avatar
      Merge dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM/BARE/4.1 · bd0f363d
      unknown authored
      into  dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM/FIXES/5.0/20919_temp_nlog
      
      
      sql/sql_base.cc:
        Manual merge
      bd0f363d
    • unknown's avatar
      Fixing problem where the command line for MYSQL_DUMP_SLAVE was not · 00abe212
      unknown authored
      set properly.
      
      
      00abe212
  6. 09 Jul, 2006 6 commits
    • unknown's avatar
      BUG#20919 temp tables closing fails when binlog is off · 868fee4d
      unknown authored
      closing temp tables through end_thread
      had a flaw in binlog-off branch of close_temporary_tables where
      next table to close was reset via table->next
       for (table= thd->temporary_tables; table; table= table->next)
      which was wrong since the current table instance got destoyed at
      	close_temporary(table, 1);
      
      The fix adapts binlog-on branch method to engage the loop's internal 'next' variable which holds table->next prior table's destoying.
      
      
      
      sql/sql_base.cc:
        no-binlog branch is fixed: scanning across temporary_tables must be careful to save next table since the current is being destroyed inside of close_temporary. 
        binlog-is-open case is ok.
      868fee4d
    • unknown's avatar
      Merge gbichot3.local:/home/mysql_src/mysql-5.1-interval-move-next-insert-id · 9939a66b
      unknown authored
      into  gbichot3.local:/home/mysql_src/mysql-5.1
      
      
      sql/ha_federated.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/handler.cc:
        will fix by hand
      mysql-test/extra/rpl_tests/rpl_insert_id.test:
        merge
      mysql-test/r/rpl_insert_id.result:
        merge
      sql/sql_insert.cc:
        merge
      9939a66b
    • unknown's avatar
      post-merge test/result fixes. · e0ef4b1e
      unknown authored
      
      mysql-test/r/rpl_switch_stm_row_mixed.result:
        post-merge fix
      mysql-test/t/rpl_switch_stm_row_mixed.test:
        post-merge fix (and no need to use a table t12 in some place).
      e0ef4b1e
    • unknown's avatar
      Merge gbichot3.local:/home/mysql_src/mysql-5.1-new-19630 · 53641471
      unknown authored
      into  gbichot3.local:/home/mysql_src/mysql-5.1
      
      
      mysql-test/t/disabled.def:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      mysql-test/r/rpl_switch_stm_row_mixed.result:
        manual merge (will fix)
      mysql-test/t/rpl_switch_stm_row_mixed.test:
        manual merge (will fix)
      53641471
    • unknown's avatar
      fixes in test results (using # for positions in SHOW BINLOG EVENTS). · f94e8d78
      unknown authored
      
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        As in other tests, we should replace both position columns of SHOW BINLOG
        EVENTS; otherwise a small change (like here, the fact that CREATE TEMPORARY
        TABLE is not binlogged in RBR as a consequence of the bugfix for BUG#20522)
        causes a large diff in the result file.
      mysql-test/r/binlog_row_mix_innodb_myisam.result:
        result update: positions in SHOW BINLOG EVENTS become #, and
        the CREATE TEMPORARY TABLE disappear from binlog (consequence of fix for
        BUG#20522 "RBR: CREATE TEMPORARY TABLE SELECT writes to binlog though
        unneeded").
      f94e8d78
    • unknown's avatar
      post-merge fixes · 15c321f6
      unknown authored
      
      mysql-test/r/rpl_switch_stm_row_mixed.result:
        result update.
        I noticed the appearance of an additional table_map+rows in the binlog
        when INSERT DELAYED, since I pulled the latest fixes to RBR of 
        INSERT DELAYED. This is ok, I put the reason why into sql_insert.cc.
      sql/sql_insert.cc:
        A comment about the new row-based binlogging of INSERT DELAYED.
        Removing duplicate MY_HOOKS (from a wrong merge of the past??).
      15c321f6