From dd36a5870fc584425325745eea1aee779e6aa49e Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 9 Feb 2005 18:17:40 -0800 Subject: Re-enable alter_table test for embedded server by moving grant-related test to grant.test and using replace_column to neuter the Privileges column in SHOW FULL COLUMNS. BitKeeper/deleted/.del-alter_table.result.es~a1077916d429e443: Delete: mysql-test/r/alter_table.result.es mysql-test/t/alter_table.test: Add replace_column for grant-related column Move grant-related test to grant.test mysql-test/r/alter_table.result: Update results mysql-test/t/grant.test: Move grant-related test from alter_table.test mysql-test/r/grant.result: Add test results mysql-test/mysql-test-run.sh: Don't skip alter_table test for embedded server --- mysql-test/mysql-test-run.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'mysql-test/mysql-test-run.sh') diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index af432f37868..0bc68c3b6bb 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1506,7 +1506,6 @@ run_testcase () # script soon anyway so it is not worth it spending the time if [ "x$USE_EMBEDDED_SERVER" = "x1" -a -z "$DO_TEST" ] ; then for t in \ - "alter_table" \ "bdb-deadlock" \ "connect" \ "ctype_latin1_de" \ -- cgit v1.2.1 From b5dd20764a76342602f18a6c6e06ba7c8daa0b85 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Feb 2005 18:08:30 -0800 Subject: Re-enable ctype_latin1_de test for embedded server (already passes, so it appears to have been accidently disabled) and enable ctype_ucs after moving a subtest that requires binlog to its own test file. mysql-test/mysql-test-run.sh: Remove hardcoded skip of ctype_latin1_de and ctype_ucs for embedded server mysql-test/t/ctype_ucs.test: Move binlog test to a new test file mysql-test/r/ctype_ucs.result: Update result after test moved --- mysql-test/mysql-test-run.sh | 2 -- 1 file changed, 2 deletions(-) (limited to 'mysql-test/mysql-test-run.sh') diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 0bc68c3b6bb..f31d1af48aa 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1508,8 +1508,6 @@ run_testcase () for t in \ "bdb-deadlock" \ "connect" \ - "ctype_latin1_de" \ - "ctype_ucs" \ "flush_block_commit" \ "grant2" \ "grant_cache" \ -- cgit v1.2.1 From b3f0eb932f0d1ca7b6dc5ec7836715d0466fec40 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 29 Mar 2005 15:50:16 -0800 Subject: Shift skipping of some tests with embedded server from within mysql-test-run to the tests themselves. mysql-test/t/bdb-deadlock.test: Don't run this test with embedded server mysql-test/mysql-test-run.sh: Remove tests from being skipped with embedded server mysql-test/t/connect.test: Skip test under embedded server mysql-test/t/flush_block_commit.test: Skip test under embedded server mysql-test/t/grant.test: Skip test under embedded server mysql-test/t/grant2.test: Skip test under embedded server mysql-test/t/grant_cache.test: Skip test under embedded server --- mysql-test/mysql-test-run.sh | 6 ------ 1 file changed, 6 deletions(-) (limited to 'mysql-test/mysql-test-run.sh') diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index f31d1af48aa..1d670fd1a16 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1506,12 +1506,6 @@ run_testcase () # script soon anyway so it is not worth it spending the time if [ "x$USE_EMBEDDED_SERVER" = "x1" -a -z "$DO_TEST" ] ; then for t in \ - "bdb-deadlock" \ - "connect" \ - "flush_block_commit" \ - "grant2" \ - "grant_cache" \ - "grant" \ "init_connect" \ "init_file" \ "innodb" \ -- cgit v1.2.1 From 23105dba56bd0ac01d6d0c0871b361c4e7b648d8 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 29 Mar 2005 16:10:43 -0800 Subject: Clean up InnoDB testing with embedded server. BitKeeper/deleted/.del-innodb.result.es~ba2a97747fd41a3a: Delete: mysql-test/r/innodb.result.es mysql-test/mysql-test-run.sh: Remove innodb tests from list of tests automatically skipped with embedded server mysql-test/r/innodb.result: Update results mysql-test/t/innodb-deadlock.test: Skip with embedded server mysql-test/t/innodb-lock.test: Skip with embedded server mysql-test/t/innodb.test: Move test of replace delayed to new test file, add to --replace_result to clean up path --- mysql-test/mysql-test-run.sh | 3 --- 1 file changed, 3 deletions(-) (limited to 'mysql-test/mysql-test-run.sh') diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 1d670fd1a16..12d1c8723d9 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1508,9 +1508,6 @@ run_testcase () for t in \ "init_connect" \ "init_file" \ - "innodb" \ - "innodb-deadlock" \ - "innodb-lock" \ "mix_innodb_myisam_binlog" \ "mysqlbinlog2" \ "mysqlbinlog" \ -- cgit v1.2.1 From 529f29379057d49abce56ee7bc18c3d326d09fc4 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 29 Mar 2005 17:17:46 -0800 Subject: Eliminate most of the remaining hardcoded list of tests to skip by adding check for embedded server within tests and splitting some tests into multiple test files. mysql-test/mysql-test-run.sh: Remove most of hardcoded list of tests to skip mysql-test/r/ps_1general.result: Update results mysql-test/r/timezone2.result: Update results mysql-test/r/user_var.result: Update results mysql-test/r/variables.result: Update results mysql-test/t/mix_innodb_myisam_binlog.test: Disable test with embedded server mysql-test/t/mysql_protocols.test: Disable test with embedded server mysql-test/t/mysqlbinlog.test: Disable test with embedded server mysql-test/t/mysqlbinlog2.test: Disable test with embedded server mysql-test/t/mysqldump.test: Disable test with embedded server mysql-test/t/packet.test: Disable test with embedded server mysql-test/t/ps_1general.test: Move parts of test to new ps_grant mysql-test/t/rename.test: Disable test with embedded server mysql-test/t/show_check.test: Disable test with embedded server mysql-test/t/system_mysql_db_fix.test: Disable test with embedded server mysql-test/t/timezone2.test: Move part of test to timezone_grant mysql-test/t/user_var.test: Move part of test to new user_var-binlog mysql-test/t/variables.test: Move part of test to rpl_variables --- mysql-test/mysql-test-run.sh | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'mysql-test/mysql-test-run.sh') diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 12d1c8723d9..b28bfd78d1b 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1506,21 +1506,8 @@ run_testcase () # script soon anyway so it is not worth it spending the time if [ "x$USE_EMBEDDED_SERVER" = "x1" -a -z "$DO_TEST" ] ; then for t in \ - "init_connect" \ - "init_file" \ - "mix_innodb_myisam_binlog" \ - "mysqlbinlog2" \ - "mysqlbinlog" \ - "mysqldump" \ - "mysql_protocols" \ - "packet" \ - "ps_1general" \ - "rename" \ - "show_check" \ - "system_mysql_db_fix" \ - "timezone2" \ - "user_var" \ - "variables" + "init_connect" \ + "init_file" do if [ "$tname" = "$t" ] ; then skip_test $tname -- cgit v1.2.1 From 3805311b8ffeb31d83553e2bba2e891dda097694 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 30 Mar 2005 17:32:44 -0800 Subject: Remove result.es files and support for them, which requires splitting up a couple of tests and adjusting the output of others. Exposes two bugs (9472 and 9508). BitKeeper/deleted/.del-drop_temp_table.result.es~bc4cfb1ee1257458: Delete: mysql-test/r/drop_temp_table.result.es BitKeeper/deleted/.del-insert_select.result.es~ae7eb9891d6c07c4: Delete: mysql-test/r/insert_select.result.es BitKeeper/deleted/.del-myisam-blob.result.es~d498dae7d9f1a6d4: Delete: mysql-test/r/myisam-blob.result.es BitKeeper/deleted/.del-packet.result.es~6e71c3b634806185: Delete: mysql-test/r/packet.result.es BitKeeper/deleted/.del-query_cache.result.es~246ad731a517d9ab: Delete: mysql-test/r/query_cache.result.es BitKeeper/deleted/.del-select.result.es~240635f6a3f1a079: Delete: mysql-test/r/select.result.es BitKeeper/deleted/.del-type_blob.result.es~a4a0d4454b2d0218: Delete: mysql-test/r/type_blob.result.es BitKeeper/deleted/.del-type_float.result.es~a5533e4118eadc04: Delete: mysql-test/r/type_float.result.es BitKeeper/deleted/.del-type_ranges.result.es~bb77517f4c9dc978: Delete: mysql-test/r/type_ranges.result.es mysql-test/mysql-test-run.sh: Remove support for special result extension -- bad idea! mysql-test/t/ps_1general.test: Explain --replace_result mysql-test/r/insert_select.result: Update results mysql-test/r/select.result: Update results mysql-test/r/type_blob.result: Update results mysql-test/r/type_float.result: Update results mysql-test/r/type_ranges.result: Update results mysql-test/t/drop_temp_table.test: Skip this test with embedded server mysql-test/t/insert_select.test: Move binlog test to new file mysql-test/t/select.test: Replace grants column from 'show full columns' mysql-test/t/type_blob.test: Replace grants column from 'show full columns' mysql-test/t/type_float.test: Replace grants column from 'show full columns' mysql-test/t/type_ranges.test: Replace grants column from 'show full columns' sql/sql_select.cc: Fix conditional around query_cache_abort() call. --- mysql-test/mysql-test-run.sh | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'mysql-test/mysql-test-run.sh') diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index b28bfd78d1b..a70ff3d59c7 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -240,7 +240,6 @@ STOP_WAIT_TIMEOUT=10 MYSQL_TEST_SSL_OPTS="" USE_TIMER="" USE_EMBEDDED_SERVER="" -RESULT_EXT="" TEST_MODE="" NDB_MGM_EXTRA_OPTS= @@ -253,7 +252,6 @@ while test $# -gt 0; do USE_EMBEDDED_SERVER=1 USE_MANAGER=0 NO_SLAVE=1 USE_RUNNING_SERVER="" - RESULT_EXT=".es" TEST_MODE="$TEST_MODE embedded" ;; --purify) USE_PURIFY=1 @@ -735,13 +733,6 @@ show_failed_diff () result_file=r/$1.result eval_file=r/$1.eval - # If we have an special externsion for result files we use it if we are recording - # or a result file with that extension exists. - if [ -n "$RESULT_EXT" -a \( x$RECORD = x1 -o -f "$result_file$RESULT_EXT" \) ] - then - result_file="$result_file$RESULT_EXT" - fi - if [ -f $eval_file ] then result_file=$eval_file @@ -1462,9 +1453,6 @@ run_testcase () result_file="r/$tname.result" echo $tname > $CURRENT_TEST SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0` - if [ -n "$RESULT_EXT" -a \( x$RECORD = x1 -o -f "$result_file$RESULT_EXT" \) ] ; then - result_file="$result_file$RESULT_EXT" - fi if [ "$USE_MANAGER" = 1 ] ; then many_slaves=`$EXPR \( \( $tname : rpl_failsafe \) != 0 \) \| \( \( $tname : rpl_chain_temp_table \) != 0 \)` fi @@ -1531,10 +1519,8 @@ run_testcase () --result-file=*) result_file=`$ECHO "$EXTRA_MASTER_OPT" | $SED -e "s;--result-file=;;"` result_file="r/$result_file.result" - if [ -n "$RESULT_EXT" -a \( x$RECORD = x1 -o -f "$result_file$RESULT_EXT" \) ] ; then - result_file="$result_file$RESULT_EXT" - fi - # Note that this must be set to space, not "" for test-reset to work + # Note that this must be set to space, not "" for test-reset to +# work EXTRA_MASTER_OPT=" " ;; esac -- cgit v1.2.1