diff options
author | unknown <jimw@mysql.com> | 2005-03-30 17:32:44 -0800 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2005-03-30 17:32:44 -0800 |
commit | f0148b21c32f0dd60e2a1732d62223b41fcd853f (patch) | |
tree | a533884083f291e5f5e1769824ce9cfb3354c78c /mysql-test/t/ps_1general.test | |
parent | 57221d3d086bf8553d618ff7700bb3a7db0edb8f (diff) | |
download | mariadb-git-f0148b21c32f0dd60e2a1732d62223b41fcd853f.tar.gz |
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.
Diffstat (limited to 'mysql-test/t/ps_1general.test')
-rw-r--r-- | mysql-test/t/ps_1general.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test index 2d55d9d18b1..c487c095144 100644 --- a/mysql-test/t/ps_1general.test +++ b/mysql-test/t/ps_1general.test @@ -595,7 +595,8 @@ drop table t2; # cases derived from client_test.c: test_rename() prepare stmt1 from ' rename table t5 to t6, t7 to t8 ' ; create table t5 (a int) ; -# rename must fail, t7 does not exist +# rename must fail, t7 does not exist +# Clean up the filename here because embedded server reports whole path --replace_result \\ / $MYSQL_TEST_DIR . /var/master-data/ / --error 1017 execute stmt1 ; |