Alexey Kopytov d95c1e3b47 Manual merge of mysql-trunk into mysql-trunk-merge. ... Conflicts: Text conflict in client/mysqlbinlog.cc Text conflict in mysql-test/Makefile.am Text conflict in mysql-test/collections/default.daily Text conflict in mysql-test/r/mysqlbinlog_row_innodb.result Text conflict in mysql-test/suite/rpl/r/rpl_typeconv_innodb.result Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test Text conflict in mysql-test/suite/rpl/t/rpl_row_create_table.test Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test Text conflict in mysql-test/suite/rpl/t/rpl_typeconv_innodb.test Text conflict in mysys/charset.c Text conflict in sql/field.cc Text conflict in sql/field.h Text conflict in sql/item.h Text conflict in sql/item_func.cc Text conflict in sql/log.cc Text conflict in sql/log_event.cc Text conflict in sql/log_event_old.cc Text conflict in sql/mysqld.cc Text conflict in sql/rpl_utility.cc Text conflict in sql/rpl_utility.h Text conflict in sql/set_var.cc Text conflict in sql/share/Makefile.am Text conflict in sql/sql_delete.cc Text conflict in sql/sql_plugin.cc Text conflict in sql/sql_select.cc Text conflict in sql/sql_table.cc Text conflict in storage/example/ha_example.h Text conflict in storage/federated/ha_federated.cc Text conflict in storage/myisammrg/ha_myisammrg.cc Text conflict in storage/myisammrg/myrg_open.c		2010-03-24 18:03:44 +03:00
..
methods1.inc	Fixes for the bugs	2007-11-20 16:04:07 +01:00
part_blocked_sql_funcs_main.inc	Post-push fixes for the bug #42849:	2009-12-14 20:27:43 +03:00
part_supported_sql_funcs_delete.inc	Bug#36732: many disabled ndb tests in test suite parts	2008-07-01 20:38:15 +02:00
part_supported_sql_funcs_main.inc	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition.pre	- Add autodetection of which my.cnfs to use for each testcase if suite does	2008-01-10 16:50:37 +01:00
partition_10.inc	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition_11.inc	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition_12.inc	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition_20.inc	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition_alter1_1.inc	Merge magare.gmz:/home/kgeorge/mysql/work/B36011-take2-5.0-bugteam	2008-05-16 19:03:50 +03:00
partition_alter1_1_2.inc	Merge magare.gmz:/home/kgeorge/mysql/work/B36011-take2-5.0-bugteam	2008-05-16 19:03:50 +03:00
partition_alter1_2.inc	Merge magare.gmz:/home/kgeorge/mysql/work/B36011-take2-5.0-bugteam	2008-05-16 19:03:50 +03:00
partition_alter2_1.inc	merge of bug#47135 into mysql-next-mr-bugfixing	2009-11-25 09:19:34 +01:00
partition_alter2_2.inc	merge of bug#47135 into mysql-next-mr-bugfixing	2009-11-25 09:19:34 +01:00
partition_alter3.inc	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition_alter4.inc	Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that	2008-08-11 20:02:03 +02:00
partition_alter_1.inc	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition_alter_11.inc	Bug#36732: many disabled ndb tests in test suite parts	2008-07-01 20:38:15 +02:00
partition_alter_13.inc	merge of bug#47135 into mysql-next-mr-bugfixing	2009-11-25 09:19:34 +01:00
partition_alter_41.inc	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition_auto_increment.inc	Bug#50392: insert_id is not reset for partitioned tables	2010-03-04 18:16:10 +01:00
partition_basic.inc	additional test fix for Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY	2008-02-29 12:52:50 +04:00
partition_basic_symlink.inc	Bug#35306: partition_basic_symlink test failures	2008-03-17 16:18:02 +01:00
partition_bigint.inc	Bug#36732: many disabled ndb tests in test suite parts	2008-07-01 20:38:15 +02:00
partition_binary.inc	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_bit.inc	Bug#34225: suite/parts test failure	2008-02-07 16:26:22 +01:00
partition_blob.inc	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_blocked_sql_funcs.inc	Fixes for the following bugs:	2007-08-27 14:08:32 -06:00
partition_char.inc	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_check.inc	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition_check_drop.inc	merged 5.1 main to 5.1-rpl	2008-08-04 07:04:47 +02:00
partition_check_read.inc	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition_check_read1.inc	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition_check_read2.inc	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition_cleanup.inc	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition_date.inc	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_datetime.inc	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_decimal.inc	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_directory.inc	Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output	2008-11-04 08:43:21 +01:00
partition_double.inc	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_engine.inc	Post push fix	2008-02-25 21:18:50 +01:00
partition_enum.inc	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_float.inc	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_int.inc	Bug#36732: many disabled ndb tests in test suite parts	2008-07-01 20:38:15 +02:00
partition_key_4col.inc	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_key_8col.inc	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_key_16col.inc	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_key_32col.inc	WL#3352, Introducing Column list partitioning, makes it possible to partition on most data types, makes it possible to prune on multi-field partitioning	2009-09-15 17:07:52 +02:00
partition_layout.inc	merged 5.1 main to 5.1-rpl	2008-08-04 07:04:47 +02:00
partition_layout_check1.inc	Fixed the parts testsuite to work with mtr2	2009-02-01 14:00:48 +02:00
partition_layout_check2.inc	Fixed the parts testsuite to work with mtr2	2009-02-01 14:00:48 +02:00
partition_mediumint.inc	Bug#36732: many disabled ndb tests in test suite parts	2008-07-01 20:38:15 +02:00
partition_methods1.inc	Bug#35306: partition_basic_symlink test failures	2008-03-17 16:18:02 +01:00
partition_methods2.inc	Bug#35306: partition_basic_symlink test failures	2008-03-17 16:18:02 +01:00
partition_mgm.inc	WL#4444 Added TRUNCATE partition support, fixes bug#19405 and bug #35111	2009-09-10 11:15:39 +02:00
partition_set.inc	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_smallint.inc	Bug#36732: many disabled ndb tests in test suite parts	2008-07-01 20:38:15 +02:00
partition_supported_sql_funcs.inc	merged 5.1 main to 5.1-rpl	2008-08-04 07:04:47 +02:00
partition_syntax.inc	Fixed test cases with regards to error codes	2009-10-21 18:27:34 +02:00
partition_syntax_1.inc	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition_syntax_2.inc	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition_text.inc	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_time.inc	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_timestamp.inc	Post-push fixes for the bug #42849:	2009-12-14 20:27:43 +03:00
partition_tinyint.inc	Bug#36732: many disabled ndb tests in test suite parts	2008-07-01 20:38:15 +02:00
partition_trigg1.inc	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition_trigg2.inc	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition_trigg3.inc	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition_value.inc	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition_varbinary.inc	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_varchar.inc	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_year.inc	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00