mirror of
https://github.com/MariaDB/server.git
synced 2025-01-28 01:34:17 +01:00
6 commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Mattias Jonsson
|
afd4b25d8a |
Bug#56659: Mismatch of CAPITAL vs small letters in "unified filelist" partitioning output
Bug#56657: Test still uses "--exec rm -f ..." which is non-portable Bug#56601: Test uses Unix path for temporary file, fails, and writes misleading message Several tests that was written in a non portable way (failed on windows) Fixed by 1) backporting the fix for replace_result to also apply to list_files (mysqltest from mysql-trunk) 2) replacing all #p#/#sp#/#tmp# to #P#/#SP#/#TMP#/ (innodb always converts filenames to lower case in windows). 3) replacing '--exec rm -f' with '--remove_files_wildcard' 4) replacing a perl snippet with '--write_file' client/mysqltest.cc: backport from mysql-trunk to allow replace_result to apply also on list_files mysql-test/suite/parts/inc/partition_check_drop.inc: Compensate for differences between innodb on windows vs unix. Using mysqltest command, instead of unix command to remove files. mysql-test/suite/parts/inc/partition_crash.inc: compensate for differences between innodb on windows vs unix mysql-test/suite/parts/inc/partition_fail.inc: compensate for differences between innodb on windows vs unix mysql-test/suite/parts/inc/partition_layout.inc: compensate for differences between innodb on windows vs unix mysql-test/suite/parts/inc/partition_layout_check1.inc: compensate for differences between innodb on windows vs unix mysql-test/suite/parts/inc/partition_layout_check2.inc: compensate for differences between innodb on windows vs unix mysql-test/suite/parts/r/partition_recover_myisam.result: updated result mysql-test/suite/parts/r/partition_special_myisam.result: updated result mysql-test/suite/parts/t/part_supported_sql_func_innodb.test: Test takes very long time, require --big flag mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test: Test takes very long time, require --big flag mysql-test/suite/parts/t/partition_alter1_2_innodb.test: Test takes very long time, require --big flag mysql-test/suite/parts/t/partition_alter2_1_1_innodb.test: Test takes very long time, require --big flag mysql-test/suite/parts/t/partition_alter2_1_2_innodb.test: Test takes very long time, require --big flag mysql-test/suite/parts/t/partition_alter2_2_2_innodb.test: Test takes very long time, require --big flag mysql-test/suite/parts/t/partition_alter4_innodb.test: Test takes very long time, require --big flag mysql-test/suite/parts/t/partition_debug_sync_innodb.test: compensate for differences between innodb on windows vs unix mysql-test/suite/parts/t/partition_recover_myisam.test: more generic suppression (failed in windows) mysql-test/suite/parts/t/partition_special_myisam.test: Using portable mysqltest command 'write_file' instead of perl snippet. |
||
|
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 |
||
|
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. |
||
|
unknown
|
9e549aefc5 | Fix paths MYSQLTEST_VARDIR/master-data -> MYSQLD_DATADIR | ||
|
unknown
|
c6a1ed022c |
- Add autodetection of which my.cnfs to use for each testcase if suite does
not have a my.cnf of it's own - Fix paths: master-data => mysqld.1/data, ../std_data_ln => MYSQLTEST_VARDIR/std_data mysql-test/lib/mtr_cases.pm: Add autodetection of which my.cnfs to use for each testcase if suite does not have a my.cnf of it's own mysql-test/suite/parts/inc/partition.pre: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/inc/partition_basic.inc: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/inc/partition_check_drop.inc: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/inc/partition_layout.inc: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/inc/partition_layout_check1.inc: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/inc/partition_layout_check2.inc: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc: Update paths, ../std_dataln_ => MYSQLTEST_VARDIR/std_data mysql-test/suite/parts/r/part_supported_sql_func_innodb.result: Update paths, ../std_dataln_ => MYSQLTEST_VARDIR/std_data mysql-test/suite/parts/r/part_supported_sql_func_myisam.result: Update paths, ../std_dataln_ => MYSQLTEST_VARDIR/std_data mysql-test/suite/parts/r/partition_alter1_myisam.result: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/r/partition_alter2_myisam.result: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/r/partition_alter3_innodb.result: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/r/partition_alter3_myisam.result: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/r/partition_alter4_myisam.result: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/r/partition_basic_innodb.result: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/r/partition_basic_myisam.result: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/r/partition_engine_myisam.result: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/r/partition_syntax_myisam.result: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/r/partition_t55.out: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/t/partition_sessions.test: Update paths, master-data => mysqld.1/data |
||
|
unknown
|
0a9e4c79d4 |
Fixes for the bugs
Bug#31610 Remove outdated and redundant tests:
partition_02myisam partition_03ndb
Bug#32405 testsuite parts: partition_char_myisam wrong content
and cleanup of testsuite
- remove/correct wrong comments
- remove workarounds for fixed bugs
- replace error numbers with error names
- exclude subtests from execution which fail now because of
new limitations for partitioning functions
- remove code for the no more intended dual use
fast test in regression tests/slow test in testsuite
- analyze and fix problems with partition_char_innodb
- fix problems caused by last change of error numbers
- Introduce error name to error number mapping which makes
maintenance after next error renumbering easier
BitKeeper/deleted/.del-partition_03ndb.result:
Rename: mysql-test/suite/ndb/r/partition_03ndb.result -> BitKeeper/deleted/.del-partition_03ndb.result
BitKeeper/deleted/.del-partition_03ndb.test:
Rename: mysql-test/suite/ndb/t/partition_03ndb.test -> BitKeeper/deleted/.del-partition_03ndb.test
BitKeeper/deleted/.del-partition_1.inc:
Rename: mysql-test/include/partition_1.inc -> BitKeeper/deleted/.del-partition_1.inc
BitKeeper/deleted/.del-partition_02myisam.result:
Rename: mysql-test/r/partition_02myisam.result -> BitKeeper/deleted/.del-partition_02myisam.result
BitKeeper/deleted/.del-partition_02myisam.test:
Rename: mysql-test/t/partition_02myisam.test -> BitKeeper/deleted/.del-partition_02myisam.test
BitKeeper/deleted/.del-partition_char_myisam.result:
Rename: mysql-test/suite/parts/r/partition_char_myisam.result -> BitKeeper/deleted/.del-partition_char_myisam.result
mysql-test/suite/parts/inc/methods1.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition.pre:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_10.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_11.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_12.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_20.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter1.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter2.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter3.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter4.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter_1.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter_11.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter_13.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter_41.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_basic.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_binary.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_bit.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_blob.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_char.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_check.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_check_drop.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_check_read.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_check_read1.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_check_read2.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_cleanup.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_directory.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_engine.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_enum.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_layout.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_layout_check1.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_layout_check2.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_methods1.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_methods2.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_set.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_syntax.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_syntax_1.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_syntax_2.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_text.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_trigg1.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_trigg2.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_trigg3.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_value.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_varbinary.inc:
Fixes + cleanup
mysql-test/suite/parts/inc/partition_varchar.inc:
Fixes + cleanup
mysql-test/suite/parts/r/partition_alter1_innodb.result:
Updated result
mysql-test/suite/parts/r/partition_alter1_myisam.result:
Updated result
mysql-test/suite/parts/r/partition_alter2_innodb.result:
Updated result
mysql-test/suite/parts/r/partition_alter2_myisam.result:
Updated result
mysql-test/suite/parts/r/partition_alter3_innodb.result:
Updated result
mysql-test/suite/parts/r/partition_alter3_myisam.result:
Updated result
mysql-test/suite/parts/r/partition_alter4_innodb.result:
Updated result
mysql-test/suite/parts/r/partition_alter4_myisam.result:
Updated result
mysql-test/suite/parts/r/partition_basic_innodb.result:
Updated result
mysql-test/suite/parts/r/partition_basic_myisam.result:
Updated result
mysql-test/suite/parts/r/partition_bit_myisam.result:
Updated result
mysql-test/suite/parts/r/partition_char_innodb.result:
Updated result
mysql-test/suite/parts/r/partition_datetime_myisam.result:
Updated result
mysql-test/suite/parts/r/partition_decimal_myisam.result:
Updated result
mysql-test/suite/parts/r/partition_engine_innodb.result:
Updated result
mysql-test/suite/parts/r/partition_engine_myisam.result:
Updated result
mysql-test/suite/parts/r/partition_float_innodb.result:
Updated result
mysql-test/suite/parts/r/partition_float_myisam.result:
Updated result
mysql-test/suite/parts/r/partition_int_myisam.result:
Updated result
mysql-test/suite/parts/r/partition_special_myisam.result:
Updated result
mysql-test/suite/parts/r/partition_syntax_innodb.result:
Updated result
mysql-test/suite/parts/r/partition_syntax_myisam.result:
Updated result
mysql-test/suite/parts/t/disabled.def:
Fixes + cleanup
mysql-test/suite/parts/t/part_blocked_sql_func_innodb.test:
Fixes + cleanup
mysql-test/suite/parts/t/part_blocked_sql_func_myisam.test:
Fixes + cleanup
mysql-test/suite/parts/t/part_supported_sql_func_innodb.test:
Fixes + cleanup
mysql-test/suite/parts/t/part_supported_sql_func_myisam.test:
Fixes + cleanup
mysql-test/suite/parts/t/part_supported_sql_func_ndb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_alter1_innodb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_alter1_myisam.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_alter1_ndb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_alter2_innodb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_alter2_myisam.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_alter2_ndb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_alter3_innodb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_alter3_myisam.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_alter4_innodb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_alter4_myisam.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_basic_innodb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_basic_myisam.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_basic_ndb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_bit_innodb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_bit_myisam.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_bit_ndb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_char_innodb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_char_myisam.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_datetime_innodb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_datetime_myisam.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_decimal_innodb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_decimal_myisam.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_engine_innodb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_engine_myisam.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_engine_ndb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_float_innodb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_float_myisam.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_int_innodb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_int_myisam.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_int_ndb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_special_innodb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_special_myisam.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_syntax_innodb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_syntax_myisam.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_syntax_ndb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_value_innodb.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_value_myisam.test:
Fixes + cleanup
mysql-test/suite/parts/t/partition_value_ndb.test:
Fixes + cleanup
mysql-test/suite/parts/r/partition_char_myisam.result:
Updated result
bk rm + new file is caused by bk complaining about filetype
|
Renamed from mysql-test/include/partition_layout.inc (Browse further)