1. 20 Jul, 2006 1 commit
    • unknown's avatar
      Bug#19939 · ca78b386
      unknown authored
        AUTHORS and CONTRIBUTORS are not reserved keywords.
      
      
      mysql-test/r/keywords.result:
        Bug#19939
          Test for bug
      mysql-test/t/keywords.test:
        Bug#19939
          Test for bug
      ca78b386
  2. 17 Jul, 2006 2 commits
  3. 15 Jul, 2006 13 commits
  4. 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
  5. 13 Jul, 2006 7 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
    • unknown's avatar
      BUG#20852: Using update with full table scan causes mysqld to enter an eternal loop · cb3a82a0
      unknown authored
      
      mysql-test/r/partition_innodb.result:
        New test case
      mysql-test/t/partition_innodb.test:
        New test case
      sql/ha_partition.cc:
        Two more handler interface variables not taken care of
      cb3a82a0
  6. 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
  7. 11 Jul, 2006 6 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
      ndb - (4.1) trivial fix to error.log (wday=0 was printed as "x") · 27721ce5
      unknown authored
      
      ndb/src/kernel/error/TimeModule.cpp:
        0=Sunday
      27721ce5
    • 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
  8. 10 Jul, 2006 4 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
      BUG#20893: Valgrind error · 907df8e3
      unknown authored
      
      mysql-test/r/partition_mgm.result:
        Added new test case
      mysql-test/t/partition_mgm.test:
        Added new test case
      sql/ha_partition.cc:
        Fixed memory overwrite, added new variable for memory check
        Problem was when reorganising partitions, the file handles
        got in the wrong place.
      sql/ha_partition.h:
        Added new variable for debugging mostly
      907df8e3
    • 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