113 commits

Author	SHA1	Message	Date
unknown	b1e00b6be8	Merge MySQL 5.1.46 into MariaDB. ... Still two test failures to be solved: main.myisam and main.subselect.	2010-04-28 14:52:24 +02:00
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
Alexey Kopytov	5d407d0c1a	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. ... Conflicts: Text conflict in mysql-test/r/partition_innodb.result Text conflict in sql/field.h Text conflict in sql/item.h Text conflict in sql/item_cmpfunc.h Text conflict in sql/item_sum.h Text conflict in sql/log_event_old.cc Text conflict in sql/protocol.cc Text conflict in sql/sql_select.cc Text conflict in sql/sql_yacc.yy	2010-03-20 23:23:42 +03:00
Mattias Jonsson	1f77c7b49a	Bug#50392: insert_id is not reset for partitioned tables ... auto_increment on duplicate entry The bug was that when INSERT_ID was used and the storage engine was told to release any reserved but not used auto_increment values, it set the highest auto_increment value to INSERT_ID. The fix was to check if the auto_increment value was forced by user (INSERT_ID) or by slave-thread, i.e. not auto- generated. So that it is only allowed to release generated values. mysql-test/r/partition_error.result: Bug#50392: insert_id is not reset for partitioned tables auto_increment on duplicate entry updated result mysql-test/suite/parts/inc/partition_auto_increment.inc: Bug#50392: insert_id is not reset for partitioned tables auto_increment on duplicate entry Added test mysql-test/suite/parts/r/partition_auto_increment_archive.result: Bug#50392: insert_id is not reset for partitioned tables auto_increment on duplicate entry Added result, note that archive does only allow increasing auto_increment values mysql-test/suite/parts/r/partition_auto_increment_blackhole.result: Bug#50392: insert_id is not reset for partitioned tables auto_increment on duplicate entry Added result, note that blackhole accepts all inserts :) mysql-test/suite/parts/r/partition_auto_increment_innodb.result: Bug#50392: insert_id is not reset for partitioned tables auto_increment on duplicate entry Added result, note that innodb rolls back inserts on error, but keeps the auto_increment value. mysql-test/suite/parts/r/partition_auto_increment_memory.result: Bug#50392: insert_id is not reset for partitioned tables auto_increment on duplicate entry Added result, note that memory and myisam inserts all rows before the error. mysql-test/suite/parts/r/partition_auto_increment_myisam.result: Bug#50392: insert_id is not reset for partitioned tables auto_increment on duplicate entry Added result, note that memory and myisam inserts all rows before the error. mysql-test/suite/parts/r/partition_auto_increment_ndb.result: Bug#50392: insert_id is not reset for partitioned tables auto_increment on duplicate entry Added result, note that NDB does not seem to handle INSERT_ID as other engines. (Martin will look into it). mysql-test/t/partition_error.test: Bug#50392: insert_id is not reset for partitioned tables auto_increment on duplicate entry Added test sql/ha_partition.cc: Bug#50392: insert_id is not reset for partitioned tables auto_increment on duplicate entry If the next_insert_id comes from non generated (i.e forced by INSERT_ID or slave-thread) then we cannot lower the reserved auto_increment value, since it have not reserved any values.	2010-03-04 18:16:10 +01:00
unknown	4bf849c23c	Merge MySQL 5.1.44 into MariaDB.	2010-03-04 09:03:07 +01:00
unknown	7c8983e99e	Fix test failures due to previous change of not setting TZ by default. ... Fix by explicitly setting timezone for a few more tests that need it. (We avoid setting TZ everywhere by default as this breaks some tests on windows). Also add fix of two other windows failures due to non-portable suppressions, thanks to Alex Budovski. mysql-test/mysql-test-run.pl: Don't let --timezone option from one test stray into the next test (mostly to make results more deterministic rather than depend on whatever test happens to run just before). mysql-test/suite/maria/r/maria-recover.result: Fix suppression pattern to also work with Windows \ path separator. mysql-test/suite/maria/t/maria-recover.test: Fix suppression pattern to also work with Windows \ path separator. mysql-test/suite/parts/inc/partition_timestamp.inc: Set timezone explicitly for test that needs it. mysql-test/suite/parts/r/partition_recover_myisam.result: Fix suppression pattern to also work with Windows \ path separator. mysql-test/suite/parts/t/partition_recover_myisam.test: Fix suppression pattern to also work with Windows \ path separator. mysql-test/t/mysqlbinlog_row-master.opt: Set timezone explicitly for test that needs it. mysql-test/t/mysqlbinlog_row_innodb-master.opt: Set timezone explicitly for test that needs it. mysql-test/t/mysqlbinlog_row_myisam-master.opt: Set timezone explicitly for test that needs it. mysql-test/t/mysqlbinlog_row_trans-master.opt: Set timezone explicitly for test that needs it.	2010-01-27 18:41:05 +01:00
Alexander Nozdrin	5f0c09dd72	Manual merge from mysql-trunk-merge. ... Conflicts: - include/my_no_pthread.h - mysql-test/r/sp-ucs2.result - sql/log.cc - sql/sql_acl.cc - sql/sql_yacc.yy	2009-12-16 21:02:21 +03:00
Alexey Kopytov	f1e83a4163	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.	2009-12-16 16:47:07 +03:00
Alexey Kopytov	3718eb7900	Post-push fixes for the bug #42849: ... All tests in the parts suite that use partitioning on a timezone-dependent expression were commented out, since it is not valid anymore.	2009-12-14 20:27:43 +03:00
Mattias Jonsson	ad03b65d6f	merge of bug#47135 into mysql-next-mr-bugfixing	2009-11-25 09:19:34 +01:00
unknown	a962160eec	Merge with MySQL 5.1, with following additions: ... - Moved some code from innodb_plugin to xtradb, to ensure that all tests runs - Did changes in pbxt and maria storage engines becasue of changes in thd->query - Reverted wrong code in sql_table.cc for how ROW_FORMAT is used. This is a re-commit of Monty's merge to eliminate an extra commit from MySQL-5.1.42 that was accidentally included in the merge. This is a merge of the MySQL 5.1.41 clone-off (clone-5.1.41-build). In case there are any extra changes done before final MySQL 5.1.41 release, these will need to be merged later before MariaDB 5.1.41 release.	2009-11-16 21:49:51 +01:00
Mikael Ronstrom	072c13d939	Merged WL#3352 into mysql-next-mr	2009-10-28 18:22:36 +01:00
Michael Widenius	358327618d	Speed up of test suite: ... - Added --disable_query_log ; begin ; .... commit; --enable_query_log around all while loops that does insert	2009-10-28 09:52:34 +02:00
Mikael Ronstrom	3903aada9b	Fixed test cases with regards to error codes	2009-10-21 18:27:34 +02:00
Mattias Jonsson	93e02adcfa	Manual merge mysql-trunk -> mysql-trunk-wl3352	2009-10-19 12:09:52 +02:00
unknown	09ab8f348f	Fix test failures in innodb-index and partition_special_*: ... - innodb-index needs regexp replace for embedded like other similar tests. - partitions_special_* need to be modified for the extension from 16 to 32 max key parts allowed that was made in MariaDB.	2009-10-06 13:39:57 +02:00
Mikael Ronstrom	ccae404afa	Merge to mysql-next-mr	2009-09-28 09:39:50 +02:00
Mikael Ronstrom	6942c25e73	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
Mikael Ronstrom	d0d52e9f11	WL#4444 Added TRUNCATE partition support, fixes bug#19405 and bug #35111	2009-09-10 11:15:39 +02:00
V Narayanan	9776b6f9cd	Bug#45823 Assertion failure in file row/row0mysql.c line 1386 ... Inserting a negative value in the autoincrement column of a partitioned innodb table was causing the value of the auto increment counter to wrap around into a very large positive value. The consequences are the same as if a very large positive value was inserted into a column, e.g. reduced autoincrement range, failure to read autoincrement counter. The current patch ensures that before calculating the next auto increment value, the current value is within the positive maximum allowed limit. mysql-test/suite/parts/inc/partition_auto_increment.inc: Bug#45823 Assertion failure in file row/row0mysql.c line 1386 Adds tests for performing insert,update and delete on a partition table with negative auto_increment values. mysql-test/suite/parts/r/partition_auto_increment_innodb.result: Bug#45823 Assertion failure in file row/row0mysql.c line 1386 Result file for the innodb engine. mysql-test/suite/parts/r/partition_auto_increment_memory.result: Bug#45823 Assertion failure in file row/row0mysql.c line 1386 Result file for the memory engine. mysql-test/suite/parts/r/partition_auto_increment_myisam.result: Bug#45823 Assertion failure in file row/row0mysql.c line 1386 Result file for the myisam engine. mysql-test/suite/parts/r/partition_auto_increment_ndb.result: Bug#45823 Assertion failure in file row/row0mysql.c line 1386 Result file for the ndb engine. mysql-test/suite/parts/t/partition_auto_increment_archive.test: Bug#45823 Assertion failure in file row/row0mysql.c line 1386 Adds a variable that allows the Archive engine to skip tests that involve insertion of negative auto increment values. mysql-test/suite/parts/t/partition_auto_increment_blackhole.test: Bug#45823 Assertion failure in file row/row0mysql.c line 1386 Adds a variable that allows the Blackhole engine to skip tests that involve insertion of negative auto increment values. sql/ha_partition.cc: Bug#45823 Assertion failure in file row/row0mysql.c line 1386 Ensures that the current value is lesser than the upper limit for the type of the field before setting the next auto increment value to be calculated. sql/ha_partition.h: Bug#45823 Assertion failure in file row/row0mysql.c line 1386 Modifies the set_auto_increment_if_higher function, to take into account negative auto increment values when doing a comparison.	2009-09-04 09:27:11 +05:30
Mattias Jonsson	5f58510a09	Backport of test results for Bug#38719 from 6.0 to 5.1 ... post push fix, Bug#38719, additional test cases updated	2009-02-18 22:35:28 +01:00
Gleb Shchepa	798f19e463	after-after-push testcase update (bug #39265)	2009-02-05 21:47:24 +04:00
Georgi Kodinov	6a4f8a8d2a	Fixed the parts testsuite to work with mtr2	2009-02-01 14:00:48 +02:00
Georgi Kodinov	6024134105	fixed some parts test suite bugs	2009-01-31 17:47:35 +02:00
Andrei Elkin	ca2d184695	merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging. ... mysql_upgrade results changed due to the error messesge of mysqlcheck has changed.	2008-11-12 19:51:47 +02:00
Mattias Jonsson	f8588915ca	merge and pre push fix for test of bug#37719	2008-11-05 22:26:39 +01:00
Mattias Jonsson	8a544f2a73	merge	2008-11-05 21:13:54 +01:00
Mattias Jonsson	bb1ad9ce08	Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output ... The partitioning clause is only a very long single line, which is very hard to interpret for a human. This patch breaks the partitioning syntax into one line for the partitioning type, and one line per partition/subpartition. mysql-test/r/information_schema_part.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/r/partition.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/r/partition_archive.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/r/partition_datatype.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/r/partition_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/r/partition_mgm.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/r/partition_mgm_err.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/r/partition_not_windows.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/r/partition_range.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/r/partition_symlink.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/ndb/r/ndb_partition_key.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/ndb/r/ndb_partition_range.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/inc/partition_directory.inc: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Changed partitioning clause format for verifying the new output format. mysql-test/suite/parts/r/ndb_dd_backuprestore.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/part_supported_sql_func_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/part_supported_sql_func_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/part_supported_sql_func_ndb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_alter1_1_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_alter1_1_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_alter1_2_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_alter1_2_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_alter2_1_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_alter2_1_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_alter2_2_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_alter2_2_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_alter3_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_alter3_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_alter4_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_alter4_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_auto_increment_archive.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_auto_increment_blackhole.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_auto_increment_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_auto_increment_memory.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_auto_increment_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_auto_increment_ndb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_basic_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_basic_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_basic_symlink_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_basic_symlink_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_bit_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_bit_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_bit_ndb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_char_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_char_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_datetime_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_datetime_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_decimal_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_decimal_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_engine_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_engine_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_engine_ndb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_float_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_float_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_int_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_int_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_int_ndb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_mgm_lc0_archive.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_mgm_lc0_memory.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_mgm_lc0_ndb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_mgm_lc1_archive.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_mgm_lc1_memory.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_mgm_lc1_ndb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_mgm_lc2_archive.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_mgm_lc2_memory.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_mgm_lc2_ndb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_special_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_special_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_syntax_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/partition_syntax_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/parts/r/rpl_partition.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/rpl/r/rpl_extraCol_innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/rpl/r/rpl_extraCol_myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/rpl/r/rpl_innodb_bug28430.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/rpl/r/rpl_row_basic_8partition.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Updated test result due to the new partitioning clause output format. mysql-test/t/partition.test: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Added small tests for for the new partitioning clause output format. mysql-test/t/partition_mgm.test: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Added small tests for for the new partitioning clause output format. sql/sql_partition.cc: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Changed formatting of the partitioning clause from single line into multiple indented lines sql/sql_show.cc: Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output Changed formatting of the partitioning clause from single line into multiple indented lines	2008-11-04 08:43:21 +01:00
Mattias Jonsson	620d955e3a	Bug#40176: update as first partitioning statement ... breaks auto increment The auto_increment value was not initialized if the first statement after opening a table was an 'UPDATE'. solution was to check initialize if it was not, before trying to increase it in update. mysql-test/suite/parts/inc/partition_auto_increment.inc: Bug#40176: update as first partitioning statement breaks auto increment Added tests for verifying the bug and show some more auto_increment flaws mysql-test/suite/parts/r/partition_auto_increment_archive.result: Bug#40176: update as first partitioning statement breaks auto increment Updated test results, due to added tests mysql-test/suite/parts/r/partition_auto_increment_blackhole.result: Bug#40176: update as first partitioning statement breaks auto increment Updated test results, due to added tests mysql-test/suite/parts/r/partition_auto_increment_innodb.result: Bug#40176: update as first partitioning statement breaks auto increment Updated test results, due to added tests mysql-test/suite/parts/r/partition_auto_increment_memory.result: Bug#40176: update as first partitioning statement breaks auto increment Updated test results, due to added tests mysql-test/suite/parts/r/partition_auto_increment_myisam.result: Bug#40176: update as first partitioning statement breaks auto increment Updated test results, due to added tests mysql-test/suite/parts/r/partition_auto_increment_ndb.result: Bug#40176: update as first partitioning statement breaks auto increment Updated test results, due to added tests sql/ha_partition.cc: Bug#40176: update as first partitioning statement breaks auto increment make sure that the auto_increment value is initialized before updating it. (missed initializing in mysql_update_row). sql/ha_partition.h: Bug#40176: update as first partitioning statement breaks auto increment Assert that it is initialized, before updating the auto_increment value	2008-10-23 22:14:07 +02:00
Mats Kindahl	32c161f3ea	Merging 5.1 main into 5.1-rpl	2008-10-23 21:27:09 +02:00
Georgi Kodinov	71e061db68	merged 5.1-5.1.29 -> 5.1-bugteam	2008-10-01 17:48:38 +03:00
Mattias Jonsson	84760783e9	Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) ... It is a very big test and as such it takes a lot of time. Solution is to divide the test in two parts, one for testing increasing column size and one for decreasing size. The innodb branch does extended tests (that myisam is not) due to the $do_pk_tests variabel, that is the reason why the innodb branch takes longer. No increase of memory usage in innodb was found when analyzing, (tested with looping some millions time of create/drop and alter commands) The memory exhaust discovered in the test is due to mysqltest which stores the result in memory (result-file) and this was the biggest result file in the test framework, so by dividing the test into two parts also cuts the memory usage of mysqltest. mysql-test/suite/parts/inc/partition_alter2_1.inc: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/inc/partition_alter2_2.inc: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/r/partition_alter2_1_innodb.result: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/r/partition_alter2_1_myisam.result: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/r/partition_alter2_2_innodb.result: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/r/partition_alter2_2_myisam.result: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/t/disabled.def: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Removed the test completely (since it has never been supported) mysql-test/suite/parts/t/partition_alter2_1_innodb.test: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/t/partition_alter2_1_myisam.test: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/t/partition_alter2_2_innodb.test: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/t/partition_alter2_2_myisam.test: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Splitted the test into two parts (one for increasing column size and one for decreasing) This leads to lower test case time (to avoid test case timeout) and less memory consumption of mysqltest (due to smaller result file) mysql-test/suite/parts/t/partition_alter2_ndb.test: Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory) Removing test since ndb has never supported these tests	2008-09-18 12:02:48 +03:00
Mattias Jonsson	be63f0af4f	Bug#38804: Query deadlock causes all tables to be inaccessible. ... Problem was a mutex added in bug n 27405 for solving a problem with auto_increment in partitioned innodb tables. (in ha_partition::write_row over partitions file->ha_write_row) Solution is to use the patch for bug#33479, which refines the usage of mutexes for auto_increment. Backport of bug-33479 from 6.0: Bug-33479: auto_increment failures in partitioning Several problems with auto_increment in partitioning (with MyISAM, InnoDB. Locking issues, not handling multi-row INSERTs properly etc.) Changed the auto_increment handling for partitioning: Added a ha_data variable in table_share for storage engine specific data such as auto_increment value handling in partitioning, also see WL 4305 and using the ha_data->mutex to lock around read + update. The idea is this: Store the table's reserved auto_increment value in the TABLE_SHARE and use a mutex to, lock it for reading and updating it and unlocking it, in one block. Only accessing all partitions when it is not initialized. Also allow reservations of ranges, and if no one has done a reservation afterwards, lower the reservation to what was actually used after the statement is done (via release_auto_increment from WL 3146). The lock is kept from the first reservation if it is statement based replication and a multi-row INSERT statement where the number of candidate rows to insert is not known in advance (like INSERT SELECT, LOAD DATA, unlike INSERT VALUES (row1), (row2),,(rowN)). This should also lead to better concurrancy (no need to have a mutex protection around write_row in all cases) and work with any local storage engine. mysql-test/suite/parts/inc/partition_auto_increment.inc: Bug#38804: Query deadlock causes all tables to be inaccessible. Backporting from 6.0 of: Bug-33479: auto_increment failures in partitioning Test source file for testing auto_increment mysql-test/suite/parts/r/partition_auto_increment_archive.result: Bug#38804: Query deadlock causes all tables to be inaccessible. Backporting from 6.0 of: Bug-33479: auto_increment failures in partitioning result file for testing auto_increment mysql-test/suite/parts/r/partition_auto_increment_blackhole.result: Bug#38804: Query deadlock causes all tables to be inaccessible. Backporting from 6.0 of: Bug-33479: auto_increment failures in partitioning result file for testing auto_increment mysql-test/suite/parts/r/partition_auto_increment_innodb.result: Bug#38804: Query deadlock causes all tables to be inaccessible. Backporting from 6.0 of: Bug-33479: auto_increment failures in partitioning result file for testing auto_increment mysql-test/suite/parts/r/partition_auto_increment_memory.result: Bug#38804: Query deadlock causes all tables to be inaccessible. Backporting from 6.0 of: Bug-33479: auto_increment failures in partitioning result file for testing auto_increment mysql-test/suite/parts/r/partition_auto_increment_myisam.result: Bug#38804: Query deadlock causes all tables to be inaccessible. Backporting from 6.0 of: Bug-33479: auto_increment failures in partitioning result file for testing auto_increment mysql-test/suite/parts/r/partition_auto_increment_ndb.result: Bug#38804: Query deadlock causes all tables to be inaccessible. Backporting from 6.0 of: Bug-33479: auto_increment failures in partitioning result file for testing auto_increment mysql-test/suite/parts/t/partition_auto_increment_archive.test: Bug#38804: Query deadlock causes all tables to be inaccessible. Backporting from 6.0 of: Bug-33479: auto_increment failures in partitioning test file for testing auto_increment mysql-test/suite/parts/t/partition_auto_increment_blackhole.test: Bug#38804: Query deadlock causes all tables to be inaccessible. Backporting from 6.0 of: Bug-33479: auto_increment failures in partitioning test file for testing auto_increment mysql-test/suite/parts/t/partition_auto_increment_innodb.test: Bug#38804: Query deadlock causes all tables to be inaccessible. Backporting from 6.0 of: Bug-33479: auto_increment failures in partitioning test file for testing auto_increment mysql-test/suite/parts/t/partition_auto_increment_memory.test: Bug#38804: Query deadlock causes all tables to be inaccessible. Backporting from 6.0 of: Bug-33479: auto_increment failures in partitioning test file for testing auto_increment mysql-test/suite/parts/t/partition_auto_increment_myisam.test: Bug#38804: Query deadlock causes all tables to be inaccessible. Backporting from 6.0 of: Bug-33479: auto_increment failures in partitioning test file for testing auto_increment mysql-test/suite/parts/t/partition_auto_increment_ndb.test: Bug#38804: Query deadlock causes all tables to be inaccessible. Backporting from 6.0 of: Bug-33479: auto_increment failures in partitioning test file for testing auto_increment sql/ha_partition.cc: Bug#38804: Query deadlock causes all tables to be inaccessible. Backporting from 6.0 of: Bug-33479: Failures using auto_increment and partitioning Changed ha_partition::get_auto_increment from file->get_auto_increment to file->info(HA_AUTO_STATUS), since it is works better with InnoDB (InnoDB can have issues with partitioning and auto_increment, where get_auto_increment sometimes can return a non updated value.) Using the new table_share->ha_data for keeping the auto_increment value, shared by all instances of the same table. It is read+updated when holding a auto_increment specific mutex. Also added release_auto_increment to decrease gaps if possible. And a lock for multi-row INSERT statements where the number of candidate rows to insert is not known in advance (like INSERT SELECT, LOAD DATA; Unlike INSERT INTO (row1),(row2),,(rowN)). Fixed a small bug, copied++ to (*copied)++ and the same for deleted. Changed from current_thd, to ha_thd() sql/ha_partition.h: Bug#38804: Query deadlock causes all tables to be inaccessible. Backporting from 6.0 of: Bug-33479: Failures using auto_increment and partitioning Added a new struct HA_DATA_PARTITION to be used in table_share->ha_data Added a private function to set auto_increment values if needed Removed the restore_auto_increment (the hander version is better) Added lock/unlock functions for auto_increment handling. Changed copied/deleted to const. sql/handler.h: Bug#38804: Query deadlock causes all tables to be inaccessible. Backporting from 6.0 of: Bug-33479: auto_increment failures in partitioning Added const for changed_partitions Added comments about SQLCOM_TRUNCATE for delete_all_rows sql/table.h: Bug#38804: Query deadlock causes all tables to be inaccessible. Backporting from 6.0 of: Bug-33479: Failures using auto_increment and partitioning Added a variable in table_share: ha_data for storage of storage engine specific data (such as auto_increment handling in partitioning).	2008-09-08 15:30:01 +02:00
He Zhenxing	b17458dcc1	Merge 5.1 main -> 5.1-rpl	2008-09-06 08:51:17 +08:00
Mattias Jonsson	642bf9022a	manual merge of bug#37402	2008-08-12 12:26:23 +02:00
Mattias Jonsson	f50c4207f2	Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that ... partition is corrupt The main problem was that ALTER TABLE t ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION took another code path (over mysql_alter_table instead of mysql_admin_table) which differs in two ways: 1) alter table opens the tables in a different way than admin tables do resulting in returning with error before it tried the command 2) alter table does not start to send any diagnostic rows to the client which the lower admin functions continue to use -> resulting in assertion crash The fix: Remapped ALTER TABLE t ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION to use the same code path as ANALYZE/CHECK/OPTIMIZE/REPAIR TABLE t. Adding check in mysql_admin_table to setup the partition list for which partitions that should be used. Partitioned tables will still not work with REPAIR TABLE/PARTITION USE_FRM, since that requires moving partitions to tables, REPAIR TABLE t USE_FRM, and check that the data still fulfills the partitioning function and then move the table back to being a partition. NOTE: I have removed the following functions from the handler interface: analyze_partitions, check_partitions, optimize_partitions, repair_partitions Since they are not longer needed. THIS ALTERS THE STORAGE ENGINE API mysql-test/r/handler_innodb.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Added a note result row. mysql-test/r/innodb.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Added a note result row. mysql-test/r/innodb_mysql.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Added a note result row. mysql-test/r/partition.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned tables. mysql-test/r/trigger-trans.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Added a note result row. mysql-test/suite/ndb/r/ndb_partition_key.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned tables. mysql-test/suite/ndb/t/ndb_partition_key.test: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned tables. mysql-test/suite/parts/inc/partition_alter4.inc: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned tables. mysql-test/suite/parts/r/partition_alter4_innodb.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned tables. mysql-test/suite/parts/r/partition_alter4_myisam.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned tables. mysql-test/suite/rpl/r/rpl_failed_optimize.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Added a note result row. mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Added a note result row. mysql-test/t/partition.test: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned tables. sql/ha_partition.cc: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Added a function for returning admin commands result rows Updated handle_opt_partitions to handle admin commands result rows, and some error filtering (as mysql_admin_table do). Removed the functions analyze/check/optimize/repair_partitions since they have no longer any use. sql/ha_partition.h: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Removed analyze/check/optimize/repair_partitions since they are no longer are needed. sql/handler.cc: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Removed analyze/check/optimize/repair_partitions since they are no longer are needed. sql/handler.h: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Removed analyze/check/optimize/repair_partitions since they are no longer are needed. sql/mysql_priv.h: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Added set_part_state for reuse of code in mysql_admin_table. (Originally fond in sql/sql_partition.cc:prep_alter_part_table) sql/protocol.cc: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Added one assert and a debug print. sql/sql_partition.cc: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Refactored code for setting up partition state, set_part_state, now used in both prep_alter_part_table and sql_table.cc:mysql_admin_table. Removed code for handling ANALYZE/CHECK/OPTIMIZE/REPAIR partitions, since it is now handled by mysql_admin_table. sql/sql_table.cc: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Added functionality in mysql_admin_table to work with partitioned tables. Fixed a possible assertion bug for HA_ADMIN_TRY_ALTER (If analyze would output a row, it fails since the row was already started). sql/sql_yacc.yy: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Remapped ALTER TABLE t ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION to use the same code path as ANALYZE/CHECK/OPTIMIZE/REPAIR TABLE instead of taking the ALTER TABLE path. Added reset of alter_info for ANALYZE/CHECK/OPTIMIZE/REPAIR TABLE since it is now used by partitioned tables. storage/myisam/mi_check.c: Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that partition is corrupt Changed warning message from "Found X parts Should be: Y parts" to "Found X key parts. Should be Y", since it could be confusing with partitioned tables.	2008-08-11 20:02:03 +02:00
Sven Sandberg	4cf30d44ef	merged 5.1 main to 5.1-rpl ... manually resolved conflicts: Text conflict in client/mysqltest.c Contents conflict in mysql-test/include/have_bug25714.inc Text conflict in mysql-test/include/have_ndbapi_examples.inc Text conflict in mysql-test/mysql-test-run.pl Text conflict in mysql-test/suite/parts/inc/partition_check_drop.inc Text conflict in mysql-test/suite/parts/inc/partition_layout.inc Text conflict in mysql-test/suite/parts/inc/partition_layout_check1.inc Text conflict in mysql-test/suite/parts/inc/partition_layout_check2.inc Text conflict in mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result Text conflict in mysql-test/suite/parts/r/partition_alter1_1_myisam.result Text conflict in mysql-test/suite/parts/r/partition_alter1_2_myisam.result Text conflict in mysql-test/suite/parts/r/partition_alter2_myisam.result Text conflict in mysql-test/suite/parts/r/partition_alter3_innodb.result Text conflict in mysql-test/suite/parts/r/partition_alter3_myisam.result Text conflict in mysql-test/suite/parts/r/partition_basic_innodb.result Text conflict in mysql-test/suite/parts/r/partition_basic_myisam.result Text conflict in mysql-test/suite/parts/r/partition_basic_symlink_myisam.result Text conflict in mysql-test/suite/parts/r/partition_engine_myisam.result Text conflict in mysql-test/suite/parts/r/partition_syntax_myisam.result Text conflict in mysql-test/suite/rpl_ndb/t/disabled.def Text conflict in mysql-test/t/disabled.def	2008-08-04 07:04:47 +02:00
Mattias Jonsson	c1e54765da	Bug#37402: Mysql cant read partitioned table with capital letter in the name ... Problem was that ha_partition had HA_FILE_BASED flag set (since it uses a .par file), but after open it uses the first partitions flags, which results in different case handling for create and for open. Solution was to change the underlying partition name so it was consistent. (Only happens when lower_case_table_names = 2, i.e. Mac OS X and storage engines without HA_FILE_BASED, like InnoDB and Memory.) (Recommit after adding rename of check_lowercase_names to get_canonical_filename, and moved it from handler.h to mysql_priv.h) NOTE: if a mixed case name for a partitioned table was created when lower_case_table_name = 2 it should be renamed or dropped before using the updated version (See bug#37402 for more info) mysql-test/include/have_case_insensitive_file_system.inc: Bug#37402: Mysql cant read partitioned table with capital letter in the name Added include file. mysql-test/include/have_lowercase0.inc: Bug#37402: Mysql cant read partitioned table with capital letter in the name moved case insensitive file system to a new file, leaving only lower_case_table_names. mysql-test/include/have_lowercase2.inc: Bug#37402: Mysql cant read partitioned table with capital letter in the name Added include file. mysql-test/lib/mtr_report.pl: Bug#37402: Mysql cant read partitioned table with capital letter in the name Removed a duplicate row and suppressed warning about setting lower_case_table_names to 2 on case sensitive file systems. mysql-test/r/case_insensitive_file_system.require: Bug#37402: Mysql cant read partitioned table with capital letter in the name Added requirement file. mysql-test/r/lowercase0.require: Bug#37402: Mysql cant read partitioned table with capital letter in the name moved case insensitive file system to a new file, leaving only lower_case_table_names. mysql-test/suite/parts/inc/partition_mgm.inc: Bug#37402: Mysql cant read partitioned table with capital letter in the name New include file for testing partitioning management functions for different settings of lower_case_table_names. mysql-test/suite/parts/r/partition_mgm_lc0_archive.result: Bug#37402: Mysql cant read partitioned table with capital letter in the name New result file. mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result: Bug#37402: Mysql cant read partitioned table with capital letter in the name New result file. mysql-test/suite/parts/r/partition_mgm_lc0_memory.result: Bug#37402: Mysql cant read partitioned table with capital letter in the name New result file. mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result: Bug#37402: Mysql cant read partitioned table with capital letter in the name New result file. mysql-test/suite/parts/r/partition_mgm_lc0_ndb.result: Bug#37402: Mysql cant read partitioned table with capital letter in the name New result file. mysql-test/suite/parts/r/partition_mgm_lc1_archive.result: Bug#37402: Mysql cant read partitioned table with capital letter in the name New result file. mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result: Bug#37402: Mysql cant read partitioned table with capital letter in the name New result file. mysql-test/suite/parts/r/partition_mgm_lc1_memory.result: Bug#37402: Mysql cant read partitioned table with capital letter in the name New result file. mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result: Bug#37402: Mysql cant read partitioned table with capital letter in the name New result file. mysql-test/suite/parts/r/partition_mgm_lc1_ndb.result: Bug#37402: Mysql cant read partitioned table with capital letter in the name New result file. mysql-test/suite/parts/r/partition_mgm_lc2_archive.result: Bug#37402: Mysql cant read partitioned table with capital letter in the name New result file. mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result: Bug#37402: Mysql cant read partitioned table with capital letter in the name New result file. mysql-test/suite/parts/r/partition_mgm_lc2_memory.result: Bug#37402: Mysql cant read partitioned table with capital letter in the name New result file. mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result: Bug#37402: Mysql cant read partitioned table with capital letter in the name New result file. mysql-test/suite/parts/r/partition_mgm_lc2_ndb.result: Bug#37402: Mysql cant read partitioned table with capital letter in the name New result file. mysql-test/suite/parts/t/partition_mgm_lc0_archive.test: Bug#37402: Mysql cant read partitioned table with capital letter in the name New test file. mysql-test/suite/parts/t/partition_mgm_lc0_innodb.test: Bug#37402: Mysql cant read partitioned table with capital letter in the name New test file. mysql-test/suite/parts/t/partition_mgm_lc0_memory.test: Bug#37402: Mysql cant read partitioned table with capital letter in the name New test file. mysql-test/suite/parts/t/partition_mgm_lc0_myisam.test: Bug#37402: Mysql cant read partitioned table with capital letter in the name New test file. mysql-test/suite/parts/t/partition_mgm_lc0_ndb.test: Bug#37402: Mysql cant read partitioned table with capital letter in the name New test file. mysql-test/suite/parts/t/partition_mgm_lc1_archive-master.opt: Bug#37402: Mysql cant read partitioned table with capital letter in the name New opt file. mysql-test/suite/parts/t/partition_mgm_lc1_archive.test: Bug#37402: Mysql cant read partitioned table with capital letter in the name New test file. mysql-test/suite/parts/t/partition_mgm_lc1_innodb-master.opt: Bug#37402: Mysql cant read partitioned table with capital letter in the name New opt file. mysql-test/suite/parts/t/partition_mgm_lc1_innodb.test: Bug#37402: Mysql cant read partitioned table with capital letter in the name New test file. mysql-test/suite/parts/t/partition_mgm_lc1_memory-master.opt: Bug#37402: Mysql cant read partitioned table with capital letter in the name New opt file. mysql-test/suite/parts/t/partition_mgm_lc1_memory.test: Bug#37402: Mysql cant read partitioned table with capital letter in the name New test file. mysql-test/suite/parts/t/partition_mgm_lc1_myisam-master.opt: Bug#37402: Mysql cant read partitioned table with capital letter in the name New opt file. mysql-test/suite/parts/t/partition_mgm_lc1_myisam.test: Bug#37402: Mysql cant read partitioned table with capital letter in the name New test file. mysql-test/suite/parts/t/partition_mgm_lc1_ndb-master.opt: Bug#37402: Mysql cant read partitioned table with capital letter in the name New opt file. mysql-test/suite/parts/t/partition_mgm_lc1_ndb.test: Bug#37402: Mysql cant read partitioned table with capital letter in the name New test file. mysql-test/suite/parts/t/partition_mgm_lc2_archive-master.opt: Bug#37402: Mysql cant read partitioned table with capital letter in the name New opt file. mysql-test/suite/parts/t/partition_mgm_lc2_archive.test: Bug#37402: Mysql cant read partitioned table with capital letter in the name New test file. mysql-test/suite/parts/t/partition_mgm_lc2_innodb-master.opt: Bug#37402: Mysql cant read partitioned table with capital letter in the name New opt file. mysql-test/suite/parts/t/partition_mgm_lc2_innodb.test: Bug#37402: Mysql cant read partitioned table with capital letter in the name New test file. mysql-test/suite/parts/t/partition_mgm_lc2_memory-master.opt: Bug#37402: Mysql cant read partitioned table with capital letter in the name New opt file. mysql-test/suite/parts/t/partition_mgm_lc2_memory.test: Bug#37402: Mysql cant read partitioned table with capital letter in the name New test file. mysql-test/suite/parts/t/partition_mgm_lc2_myisam-master.opt: Bug#37402: Mysql cant read partitioned table with capital letter in the name New opt file. mysql-test/suite/parts/t/partition_mgm_lc2_myisam.test: Bug#37402: Mysql cant read partitioned table with capital letter in the name New test file. mysql-test/suite/parts/t/partition_mgm_lc2_ndb-master.opt: Bug#37402: Mysql cant read partitioned table with capital letter in the name New opt file. mysql-test/suite/parts/t/partition_mgm_lc2_ndb.test: Bug#37402: Mysql cant read partitioned table with capital letter in the name New test file. mysql-test/t/lowercase_table3.test: Bug#37402: Mysql cant read partitioned table with capital letter in the name Moved case sensitive file system to a specific inc-file instead of included in lowercase0.inc sql/ha_partition.cc: Bug#37402: Mysql cant read partitioned table with capital letter in the name Problem was that ha_partition had HA_FILE_BASED set (since it uses a .par file), but after open it uses the first partitions table_flags(), which results in different case handling for create and for open. Solution was to change the underlying partition name so it was consistent. (Only happens when lower_case_table_names = 2, i.e. Mac OS X) sql/handler.cc: Bug#37402: Mysql cant read partitioned table with capital letter in the name Renamed check_lowercase_names to get_canonical_filename, and exported it so that ha_partition.cc can use the function. sql/mysql_priv.h: Bug#37402: Mysql cant read partitioned table with capital letter in the name Renamed check_lowercase_names to get_canonical_filename, and exported it so that ha_partition.cc can use the function.	2008-07-11 01:14:13 +02:00
Mattias Jonsson	c4b408f96d	merge	2008-07-09 15:15:11 +02:00
Mattias Jonsson	d4b0fcc90a	Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls' ... The problem is that relying on the output of the 'ls' command is not portable as its behavior is not the same between systems and it might even not be available at all in (Windows). So I added list_files that relies on the portable mysys library instead. (and also list_files_write_file and list_files_append_file, since the test was using '--exec ls' in that way.) client/mysqltest.c: Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls' To be able to replace the use of '--exec ls' I have added list_files, list_files_write_file and list_files_append_file. list_files <dirname> [<filename incl. wild-cards>] is equivalent to 'ls <dirname>/[<filename incl. wild-cards>]' list_files_write_file creates/overwrites a file with the content list_files_append_file creates/appends a file with the content list_files* return a sorted output. mysql-test/r/mysqltest.result: Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls' result file change, due to added test of the new list_files command. mysql-test/suite/parts/inc/partition_check_drop.inc: Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls' Using the new list_files instead of 'ls'. Changed the use of local variables (ls_file, file_list) and server variable (@aux). mysql-test/suite/parts/inc/partition_layout.inc: Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls' Using the new list_files instead of 'ls'. mysql-test/suite/parts/inc/partition_layout_check1.inc: Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls' Using the new list_files instead of 'ls'. mysql-test/suite/parts/inc/partition_layout_check2.inc: Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls' Replaces '--exec ls' with list_files. Removal of the directory part of file listing. mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result: Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls' Replaces '--exec ls' with list_files. Removal of the directory part of file listing. mysql-test/suite/parts/r/partition_alter1_1_myisam.result: Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls' Replaces '--exec ls' with list_files. Removal of the directory part of file listing. mysql-test/suite/parts/r/partition_alter1_2_myisam.result: Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls' Replaces '--exec ls' with list_files. Removal of the directory part of file listing. mysql-test/suite/parts/r/partition_alter2_myisam.result: Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls' Replaces '--exec ls' with list_files. Removal of the directory part of file listing. mysql-test/suite/parts/r/partition_alter3_innodb.result: Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls' Replaces '--exec ls' with list_files. Removal of the directory part of file listing. mysql-test/suite/parts/r/partition_alter3_myisam.result: Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls' Replaces '--exec ls' with list_files. Removal of the directory part of file listing. mysql-test/suite/parts/r/partition_basic_innodb.result: Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls' Replaces '--exec ls' with list_files. Removal of the directory part of file listing. mysql-test/suite/parts/r/partition_basic_myisam.result: Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls' Replaces '--exec ls' with list_files. Removal of the directory part of file listing. mysql-test/suite/parts/r/partition_basic_symlink_myisam.result: Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls' Replaces '--exec ls' with list_files. Removal of the directory part of file listing. mysql-test/suite/parts/r/partition_engine_myisam.result: Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls' Replaces '--exec ls' with list_files. Removal of the directory part of file listing. mysql-test/suite/parts/r/partition_syntax_myisam.result: Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls' Replaces '--exec ls' with list_files. Removal of the directory part of file listing. mysql-test/t/mysqltest.test: Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls' Adding test for the new mysqltest commands list_files, list_files_write_file and list_files_append_file.	2008-07-09 13:19:04 +02:00
Mattias Jonsson	67174b712b	Bug#36732: many disabled ndb tests in test suite parts ... REORGANIZE TEST parts WHERE ENGINE='NDB' ;) Updated tests for better matching NDB's limitations. Removed some duplicate tests. mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc: Bug#36732: many disabled ndb tests in test suite parts Added variable for NDB (since it does not support DROP PARTITION) mysql-test/suite/parts/inc/partition_alter_11.inc: Bug#36732: many disabled ndb tests in test suite parts Assigning directly to variable without going through the server. mysql-test/suite/parts/inc/partition_bigint.inc: Bug#36732: many disabled ndb tests in test suite parts Added --sorted_result for consistency lowered number of partitions for use with NDB (NDB can only do maximum of 8 partitions) mysql-test/suite/parts/inc/partition_int.inc: Bug#36732: many disabled ndb tests in test suite parts Added --sorted_result for consistency lowered number of partitions for use with NDB (NDB can only do maximum of 8 partitions) mysql-test/suite/parts/inc/partition_mediumint.inc: Bug#36732: many disabled ndb tests in test suite parts Added --sorted_result for consistency lowered number of partitions for use with NDB (NDB can only do maximum of 8 partitions) mysql-test/suite/parts/inc/partition_smallint.inc: Bug#36732: many disabled ndb tests in test suite parts Added --sorted_result for consistency lowered number of partitions for use with NDB (NDB can only do maximum of 8 partitions) mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc: Bug#36732: many disabled ndb tests in test suite parts Made it work better with NDB mysql-test/suite/parts/inc/partition_tinyint.inc: Bug#36732: many disabled ndb tests in test suite parts Added --sorted_result for consistency lowered number of partitions for use with NDB (NDB can only do maximum of 8 partitions) mysql-test/suite/parts/r/ndb_blob_partition.result: Bug#36732: many disabled ndb tests in test suite parts Removing this duplicate test since it already exists (and updated) in suite/ndb mysql-test/suite/parts/r/ndb_dd_backuprestore.result: Bug#36732: many disabled ndb tests in test suite parts Updated result file mysql-test/suite/parts/r/ndb_partition_error.result: Bug#36732: many disabled ndb tests in test suite parts Removing this duplicate test since it already exists (and updated) in suite/ndb mysql-test/suite/parts/r/ndb_partition_key.result: Bug#36732: many disabled ndb tests in test suite parts Removing this duplicate test since it already exists (and updated) in suite/ndb mysql-test/suite/parts/r/ndb_partition_list.result: Bug#36732: many disabled ndb tests in test suite parts Removing this duplicate test since it already exists (and updated) in suite/ndb mysql-test/suite/parts/r/ndb_partition_range.result: Bug#36732: many disabled ndb tests in test suite parts Removing this duplicate test since it already exists (and updated) in suite/ndb mysql-test/suite/parts/r/part_supported_sql_func_ndb.result: Bug#36732: many disabled ndb tests in test suite parts Updated result file mysql-test/suite/parts/r/partition_alter1_1_innodb.result: Bug#36732: many disabled ndb tests in test suite parts Updated result file mysql-test/suite/parts/r/partition_alter1_1_myisam.result: Bug#36732: many disabled ndb tests in test suite parts Updated result file mysql-test/suite/parts/r/partition_alter1_2_innodb.result: Bug#36732: many disabled ndb tests in test suite parts Updated result file. Diff bigger than necessary, due to bzr diff bug. mysql-test/suite/parts/r/partition_alter1_2_myisam.result: Bug#36732: many disabled ndb tests in test suite parts Updated result file mysql-test/suite/parts/r/partition_alter2_innodb.result: Bug#36732: many disabled ndb tests in test suite parts Updated result file mysql-test/suite/parts/r/partition_alter2_myisam.result: Bug#36732: many disabled ndb tests in test suite parts Updated result file mysql-test/suite/parts/r/partition_engine_ndb.result: Bug#36732: many disabled ndb tests in test suite parts Updated result file mysql-test/suite/parts/r/partition_int_innodb.result: Bug#36732: many disabled ndb tests in test suite parts Updated result file mysql-test/suite/parts/r/partition_int_myisam.result: Bug#36732: many disabled ndb tests in test suite parts Updated result file mysql-test/suite/parts/r/partition_int_ndb.result: Bug#36732: many disabled ndb tests in test suite parts Updated result file mysql-test/suite/parts/r/rpl_ndb_dd_partitions.result: Bug#36732: many disabled ndb tests in test suite parts Removing this duplicate test since it already exists (and updated) in suite/rpl_ndb mysql-test/suite/parts/t/disabled.def: Bug#36732: many disabled ndb tests in test suite parts Removed some duplicate tests, fixed some tests. Removed the 'runs too long on PB' test from disabled.def and made them to require 'big-test'. mysql-test/suite/parts/t/ndb_blob_partition.test: Bug#36732: many disabled ndb tests in test suite parts Removing this duplicate test since it already exists (and updated) in suite/ndb mysql-test/suite/parts/t/ndb_dd_backuprestore.test: Bug#36732: many disabled ndb tests in test suite parts Added new=on for allowing test of hash/range and list partitioning. mysql-test/suite/parts/t/ndb_partition_error.test: Bug#36732: many disabled ndb tests in test suite parts Removing this duplicate test since it already exists (and updated) in suite/ndb mysql-test/suite/parts/t/ndb_partition_key.test: Bug#36732: many disabled ndb tests in test suite parts Removing this duplicate test since it already exists (and updated) in suite/ndb mysql-test/suite/parts/t/ndb_partition_list.test: Bug#36732: many disabled ndb tests in test suite parts Removing this duplicate test since it already exists (and updated) in suite/ndb mysql-test/suite/parts/t/ndb_partition_range.test: Bug#36732: many disabled ndb tests in test suite parts Removing this duplicate test since it already exists (and updated) in suite/ndb mysql-test/suite/parts/t/part_supported_sql_func_ndb.test: Bug#36732: many disabled ndb tests in test suite parts Added new=on for allowing test of hash/range and list partitioning. Added ndb restriction variables. mysql-test/suite/parts/t/partition_alter1_1_2_ndb.test: Bug#36732: many disabled ndb tests in test suite parts requiring big-test instead of disable it. mysql-test/suite/parts/t/partition_alter1_1_ndb.test: Bug#36732: many disabled ndb tests in test suite parts requiring big-test instead of disable it. mysql-test/suite/parts/t/partition_alter1_2_ndb.test: Bug#36732: many disabled ndb tests in test suite parts requiring big-test instead of disable it. mysql-test/suite/parts/t/partition_alter2_ndb.test: Bug#36732: many disabled ndb tests in test suite parts Added new=on for allowing test of hash/range and list partitioning. mysql-test/suite/parts/t/partition_basic_ndb.test: Bug#36732: many disabled ndb tests in test suite parts Added new=on for allowing test of hash/range and list partitioning. mysql-test/suite/parts/t/partition_bit_ndb.test: Bug#36732: many disabled ndb tests in test suite parts Added new=on for allowing test of hash/range and list partitioning. mysql-test/suite/parts/t/partition_engine_ndb.test: Bug#36732: many disabled ndb tests in test suite parts Added new=on for allowing test of hash/range and list partitioning. mysql-test/suite/parts/t/partition_int_ndb.test: Bug#36732: many disabled ndb tests in test suite parts Added new=on for allowing test of hash/range and list partitioning. mysql-test/suite/parts/t/partition_syntax_ndb.test: Bug#36732: many disabled ndb tests in test suite parts Added new=on for allowing test of hash/range and list partitioning. mysql-test/suite/parts/t/partition_value_ndb.test: Bug#36732: many disabled ndb tests in test suite parts Added new=on for allowing test of hash/range and list partitioning. mysql-test/suite/parts/t/rpl_ndb_dd_partitions.test: Bug#36732: many disabled ndb tests in test suite parts Removing this duplicate test since it already exists (and updated) in suite/rpl_ndb	2008-07-01 20:38:15 +02:00
Magnus Svensson	8b7a3b972f	Fix paths	2008-06-18 17:49:32 +02:00
Magnus Svensson	867b60e08b	Merge 5.1->5.1-rpl ... Fix paths and name of a few files to make it work with new mtr.pl	2008-05-30 11:12:07 +02:00
unknown	277e783d13	Merge magare.gmz:/home/kgeorge/mysql/work/B36011-take2-5.0-bugteam ... into magare.gmz:/home/kgeorge/mysql/work/B36011-5.1-bugteam sql/sql_select.cc: Auto merged mysql-test/r/subselect.result: merge of bug 36011 to 5.1-bugteam mysql-test/t/subselect.test: merge of bug 36011 to 5.1-bugteam	2008-05-16 19:03:50 +03:00
unknown	e381739740	Bug#35744 - Test 'partition_alter1_innodb' times out on multiple platforms. ... Split the test into 3 smaller parts, reducing single test run time. NDB variant still disabled. The runtime for a single test is greater than the runtime for the Innodb variant that was timing out. The test works, but disabled for Build systems. BitKeeper/deleted/.del-partition_alter1_innodb.test: ***MISSING TEXT*** BitKeeper/deleted/.del-partition_alter1_myisam.test: ***MISSING TEXT*** BitKeeper/deleted/.del-partition_alter1_ndb.test: ***MISSING TEXT*** BitKeeper/deleted/.del-partition_alter1_myisam.result: ***MISSING TEXT*** BitKeeper/deleted/.del-partition_alter1_innodb.result: ***MISSING TEXT*** BitKeeper/deleted/.del-partition_alter1.inc: ***MISSING TEXT*** mysql-test/suite/parts/t/disabled.def: ***MISSING TEXT*** mysql-test/suite/parts/inc/partition_alter1_1.inc: ***MISSING WEAVE*** mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test: ***MISSING WEAVE*** mysql-test/suite/parts/t/partition_alter1_1_2_myisam.test: ***MISSING WEAVE*** mysql-test/suite/parts/t/partition_alter1_1_2_ndb.test: ***MISSING WEAVE*** mysql-test/suite/parts/t/partition_alter1_1_innodb.test: ***MISSING WEAVE*** mysql-test/suite/parts/t/partition_alter1_1_myisam.test: ***MISSING WEAVE*** mysql-test/suite/parts/t/partition_alter1_1_ndb.test: ***MISSING WEAVE*** mysql-test/suite/parts/t/partition_alter1_2_innodb.test: ***MISSING WEAVE*** mysql-test/suite/parts/t/partition_alter1_2_myisam.test: ***MISSING WEAVE*** mysql-test/suite/parts/t/partition_alter1_2_ndb.test: ***MISSING WEAVE*** BitKeeper/etc/ignore: ***MISSING TEXT*** mysql-test/suite/parts/inc/partition_alter1_1_2.inc: ***MISSING WEAVE*** mysql-test/suite/parts/inc/partition_alter1_2.inc: ***MISSING WEAVE*** mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result: ***MISSING WEAVE*** mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result: ***MISSING WEAVE*** mysql-test/suite/parts/r/partition_alter1_1_2_ndb.result: ***MISSING WEAVE*** mysql-test/suite/parts/r/partition_alter1_1_innodb.result: ***MISSING WEAVE*** mysql-test/suite/parts/r/partition_alter1_1_myisam.result: ***MISSING WEAVE*** mysql-test/suite/parts/r/partition_alter1_1_ndb.result: ***MISSING WEAVE*** mysql-test/suite/parts/r/partition_alter1_2_innodb.result: ***MISSING WEAVE*** mysql-test/suite/parts/r/partition_alter1_2_myisam.result: ***MISSING WEAVE*** mysql-test/suite/parts/r/partition_alter1_2_ndb.result: ***MISSING WEAVE***	2008-05-13 19:10:52 -04:00
unknown	92098d5d66	Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows ... Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows Bug#36034 - Test parts.part_supported_sql_func_<eng> fails on Windows Bug#36036 - Test parts.partition_alter1_<eng> fails on Windows Bug#36037 - Test parts.partition_alter2_<eng> fails on Windows Bug#36038 - Test parts.partition_basic_<engine> failing on Windows Bug#36039 - Test parts.partition_engine_<eng> fails on Windows Bug#36040 - Test parts.partition_syntax_<eng> fails on Windows Changeset to fix multiple 5.1.24-rc build bugs on Windows platforms. Many of these bugs had the same root causes. mysql-test/mysql-test-run.pl: Bug#36034 - Test parts.partition_supported_sql_func_<eng> fails on Windows Kent suggested these changes to ensure all contents of mysql-test/std_data are copied to std_data_ln on Windows (no symlinks) mysql-test/suite/funcs_1/datadict/processlist_priv.inc: Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows Altered .inc file to include HOST column in the --replace_column clauses. Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost. mysql-test/suite/funcs_1/datadict/processlist_val.inc: Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows Altered .inc file to include HOST column in the --replace_column clauses. Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost. mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result: Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows Altered .inc file to include HOST column in the --replace_column clauses. Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost. -reran .result file to account for change in --replace_column calls mysql-test/suite/funcs_1/r/processlist_priv_ps.result: Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows Altered .inc file to include HOST column in the --replace_column clauses. Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost. -reran .result file to account for change in --replace_column calls mysql-test/suite/funcs_1/r/processlist_val_no_prot.result: Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows Altered .inc file to include HOST column in the --replace_column clauses. Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost. Reran .result file to account for changes to --replace_column clauses mysql-test/suite/funcs_1/r/processlist_val_ps.result: Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows Altered .inc file to include HOST column in the --replace_column clauses. Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost. Reran .result file to account for changes to --replace_column clauses mysql-test/suite/parts/inc/partition_layout_check1.inc: Bug#36036 - Test parts.partition_alter1_<eng> fails on Windows Bug#36037 - Test parts.partition_alter2_<eng> fails on Windows Bug#36038 - Test parts.partition_basic_<engine> failing on Windows Bug#36039 - Test parts.partition_engine_<eng> fails on Windows Bug#36040 - Test parts.partition_syntax_<eng> fails on Windows Added replace_result clause to account for Windows' use of '\r' vs. '\n' This difference was causing failures on Windows. Also, mleich added some changes to remove some -ls clauses that weren't necessary mysql-test/suite/parts/inc/partition_layout_check2.inc: Bug#36036 - Test parts.partition_alter1_<eng> fails on Windows Bug#36037 - Test parts.partition_alter2_<eng> fails on Windows Bug#36038 - Test parts.partition_basic_<engine> failing on Windows Bug#36039 - Test parts.partition_engine_<eng> fails on Windows Bug#36040 - Test parts.partition_syntax_<eng> fails on Windows Added replace_result clause to account for Windows' use of '\r' vs. '\n' This difference was causing failures on Windows. Also, mleich added some changes to remove some -ls clauses that weren't necessary mysql-test/suite/parts/r/partition_basic_symlink_myisam.result: changes by mleich to remove unneeded use of -ls clause in .result file These clauses were removed from partition_layout_check1.inc and partition_layout_check2.inc	2008-04-26 19:52:43 -04:00
unknown	9e549aefc5	Fix paths MYSQLTEST_VARDIR/master-data -> MYSQLD_DATADIR	2008-04-04 17:46:48 +02:00
unknown	3ad402570d	Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl ... into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-rpl_row_charset.test: Auto merged CMakeLists.txt: Auto merged configure.in: Auto merged client/mysqltest.c: Auto merged mysql-test/extra/binlog_tests/blackhole.test: Auto merged mysql-test/include/commit.inc: Auto merged mysql-test/include/mix1.inc: Auto merged mysql-test/lib/mtr_report.pm: Auto merged mysql-test/r/commit_1innodb.result: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/ctype_big5.result: Auto merged mysql-test/r/drop.result: Auto merged mysql-test/r/group_by.result: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/r/loaddata.result: Auto merged mysql-test/r/mysqlbinlog.result: Auto merged mysql-test/r/partition_error.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result: Auto merged mysql-test/suite/binlog/r/binlog_stm_blackhole.result: Auto merged mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: Auto merged mysql-test/suite/binlog/r/binlog_unsafe.result: Auto merged mysql-test/suite/binlog/t/binlog_unsafe.test: Auto merged mysql-test/suite/federated/federated.result: Auto merged mysql-test/suite/federated/federated.test: Auto merged mysql-test/suite/parts/r/partition_alter1_myisam.result: Auto merged mysql-test/suite/parts/r/partition_alter2_myisam.result: Auto merged mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result: Auto merged mysql-test/suite/rpl/r/rpl_row_log.result: Auto merged mysql-test/suite/rpl/r/rpl_row_log_innodb.result: Auto merged mysql-test/suite/rpl/t/disabled.def: Auto merged mysql-test/suite/rpl/t/rpl_flushlog_loop.test: Auto merged mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/csv.test: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/distinct.test: Auto merged mysql-test/t/drop.test: Auto merged mysql-test/t/group_by.test: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/loaddata.test: Auto merged mysql-test/t/partition_error.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/view.test: Auto merged mysql-test/t/warnings.test: Auto merged sql/ha_ndbcluster.cc: Auto merged BitKeeper/deleted/.del-combinations: Delete: mysql-test/suite/binlog/combinations mysql-test/r/partition_not_windows.result: Use remote mysql-test/r/partition_symlink.result: Use remote mysql-test/r/symlink.result: SCCS merged mysql-test/suite/parts/inc/partition_basic.inc: SCCS merged mysql-test/suite/parts/inc/partition_check_drop.inc: Use remote mysql-test/suite/parts/inc/partition_layout_check1.inc: Use remote mysql-test/suite/parts/inc/partition_layout_check2.inc: Use remote mysql-test/suite/parts/r/partition_basic_innodb.result: Use remote mysql-test/suite/parts/r/partition_basic_myisam.result: Use remote mysql-test/suite/parts/r/partition_engine_myisam.result: Use remote mysql-test/suite/parts/t/partition_sessions.test: SCCS merged mysql-test/t/partition.test: SCCS merged mysql-test/t/partition_not_windows.test: Use remote mysql-test/t/partition_symlink.test: Use remote mysql-test/t/symlink.test: Use remote mysql-test/suite/binlog/r/binlog_multi_engine.result: Manual merge, name of binlog file changed mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test: Manual merge mysys/my_init.c: Manual merge	2008-04-03 11:50:43 +02:00
unknown	7a22a8a965	Bug#35306: partition_basic_symlink test failures ... Have changed the DATA/INDEX dir to not be a database dir. (and made some changes for better result files.) mysql-test/suite/parts/inc/partition_basic_symlink.inc: Bug#35306: partition_basic_symlink test failures after bug 32167 it is not allowed with DATA/INDEX DIR in any database directory. remade the inc-files to make better use of each other (less duplicate tests) mysql-test/suite/parts/inc/partition_directory.inc: Removed disable/enable_query_log for better result files mysql-test/suite/parts/inc/partition_layout_check1.inc: changed DATA/INDEX DIR mysql-test/suite/parts/inc/partition_layout_check2.inc: added check with_directories mysql-test/suite/parts/inc/partition_methods1.inc: Removed disable/enable_query_log for better result files mysql-test/suite/parts/inc/partition_methods2.inc: Removed disable/enable_query_log for better result files Added with_directories for testing of DATA/INDEX DIR mysql-test/suite/parts/r/partition_basic_innodb.result: Updated test result due to test case changes mysql-test/suite/parts/r/partition_basic_myisam.result: Updated test result due to test case changes mysql-test/suite/parts/r/partition_basic_symlink_innodb.result: Updated test result due to test case changes mysql-test/suite/parts/r/partition_basic_symlink_myisam.result: Updated test result due to test case changes mysql-test/suite/parts/t/disabled.def: Bug#35306: parts.partition_basic_symlink test failures Enable the test again since the have been fixed mysql-test/suite/parts/t/partition_basic_innodb.test: Added check for table files. mysql-test/suite/parts/t/partition_basic_myisam.test: removing dependency of symlink (test exists now in parts.partition_basic_symlink_myisam) mysql-test/suite/parts/t/partition_basic_symlink_innodb.test: Bug#35306: partition_basic_symlink test failures Removed old test (since DATA/INDEX DIRECTORY is not supported in InnoDB) and replaced it with a simple test that altering a partitioned innodb with DATA/INDEX DIR to MyISAM, would use the DATA/INDEX DIR.	2008-03-17 16:18:02 +01:00
unknown	4801c682e7	Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1 ... into pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1 configure.in: Auto merged mysql-test/r/func_misc.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/partition.result: Auto merged mysql-test/r/partition_symlink.result: Auto merged mysql-test/t/func_misc.test: Auto merged mysql-test/t/partition.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/partition_info.cc: Auto merged sql/partition_info.h: Auto merged sql/rpl_rli.cc: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_show.cc: Auto merged mysql-test/r/symlink.result: manual merge mysql-test/suite/parts/inc/partition_basic.inc: manual merge mysql-test/suite/parts/r/partition_basic_innodb.result: manual merge mysql-test/suite/parts/r/partition_basic_myisam.result: manual merge mysql-test/t/partition_symlink.test: manual merge mysql-test/t/symlink.test: manual merge sql/sql_parse.cc: manual merge	2008-03-14 11:13:54 -07:00