- 20 Jul, 2006 1 commit
-
-
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
-
- 17 Jul, 2006 2 commits
- 15 Jul, 2006 13 commits
-
-
unknown authored
-
unknown authored
into dator5.(none):/home/pappa/push_tree_w28
-
unknown authored
into orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51 storage/ndb/src/kernel/error/TimeModule.cpp: SCCS merged
-
unknown authored
mysql-test/t/ndb_alter_table.test: Remove file that the test leaves behind mysql-test/t/partition.test: Remove file that the other tests leaves behind mysql-test/t/rpl_ndb_bank.test: Remove file that the test leaves behind mysql-test/t/rpl_ndb_dd_advance.test: Remove file that the test leaves behind
-
unknown authored
into dator5.(none):/home/pappa/push_tree_w28
-
unknown authored
storage/ndb/tools/restore/consumer_restore.cpp: print disk data tablespace and file error on 'err' level
-
unknown authored
-
unknown authored
into dator5.(none):/home/pappa/push_tree_w28 sql/ha_partition.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
into dator5.(none):/home/pappa/push_tree_w28 sql/ha_partition.cc: Auto merged sql/ha_partition.h: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
into dator5.(none):/home/pappa/push_tree_w28 sql/ha_partition.cc: Auto merged
-
unknown authored
into dator5.(none):/home/pappa/push_tree_w28 sql/ha_partition.cc: Auto merged sql/ha_partition.h: Auto merged
-
unknown authored
into dator5.(none):/home/pappa/push_tree_w28 sql/ha_partition.cc: Auto merged sql/ha_partition.h: Auto merged
-
unknown authored
mysql-test/r/partition_order.result: Changed a test case to handle ordered index scan reverse order as well mysql-test/t/partition_order.test: Changed a test case to handle ordered index scan reverse order as well sql/ha_myisam.cc: More debug info sql/ha_partition.cc: Introduced partition_index_read_last to ensure we use index_read_last in those cases towards underlying handler. Ensured that index_read with HA_READ_PREFIX_LAST, HA_READ_PREFIX_LAST_OR_PREV and HA_READ_BEFORE_KEY uses ordered index scan in reverse order. sql/ha_partition.h: Introduced partition_index_read_last to ensure we use index_read_last in those cases towards underlying handler. Ensured that index_read with HA_READ_PREFIX_LAST, HA_READ_PREFIX_LAST_OR_PREV and HA_READ_BEFORE_KEY uses ordered index scan in reverse order.
-
- 14 Jul, 2006 3 commits
-
-
unknown authored
mysql-test/r/information_schema.result: Post-merge fixes.
-
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.
-
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
-
- 13 Jul, 2006 7 commits
-
-
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.
-
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.
-
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
-
unknown authored
into trift2.:/M51/merge-5.1 configure.in: Null merge - the 5.0 version number does not propagate into 5.1
-
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.
-
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.
-
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
-
- 12 Jul, 2006 4 commits
-
-
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.
-
unknown authored
into dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.1-new-rpl sql/ha_federated.cc: Auto merged
-
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
-
unknown authored
mysql-test/r/rpl_switch_stm_row_mixed.result: Result change sql/sql_class.h: Post-merge fixes.
-
- 11 Jul, 2006 6 commits
-
-
unknown authored
into trift2.:/M51/merge-5.1 mysql-test/r/federated.result: Auto merged mysql-test/t/federated.test: Auto merged
-
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.
-
unknown authored
ndb/src/kernel/error/TimeModule.cpp: 0=Sunday
-
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
-
unknown authored
into chilla.local:/home/mydev/mysql-5.1-amerge
-
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
-
- 10 Jul, 2006 4 commits
-
-
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
-
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
-
unknown authored
-
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
-