diff options
author | unknown <monty@mysql.com> | 2004-10-07 10:50:13 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-10-07 10:50:13 +0300 |
commit | 96e7be58c86335d68c5c79b750244e2762d6e319 (patch) | |
tree | 2ca781cd075a86d68ada5b4565202c8f62a8d84a /mysql-test/t/handler.test | |
parent | bbab9ec678f9e8a0309f0b018cf6d22cd93acf84 (diff) | |
download | mariadb-git-96e7be58c86335d68c5c79b750244e2762d6e319.tar.gz |
After merge fixes
Some bigger code changes was necessary becasue of the multi-table-update and the new HANDLER code
include/hash.h:
Added back function that's was used in 4.0
mysql-test/r/delete.result:
Update results after merge
mysql-test/r/flush_table.result:
Update results after merge
mysql-test/r/func_str.result:
Update results after merge
mysql-test/r/handler.result:
Update results after merge
Change is big becasue in MySQL 4.1 you are not allowed to qualify the handler alias with a databasename
mysql-test/r/multi_update.result:
More startup cleanups
mysql-test/r/rename.result:
More startup-cleanups
mysql-test/r/select.result:
More startup cleanups
mysql-test/r/show_check.result:
More startup-cleanups
mysql-test/t/ctype_latin1_de.test:
Cleanup
mysql-test/t/derived.test:
Portability fix
mysql-test/t/handler.test:
Update results after merge
Change is big becasue in MySQL 4.1 you are not allowed to qualify the handler alias with a databasename
mysql-test/t/multi_update.test:
More startup cleanups
mysql-test/t/range.test:
More comments
mysql-test/t/rename.test:
More startup cleanups
mysql-test/t/select.test:
More startup cleanups
mysql-test/t/show_check.test:
More startup cleanups
mysql-test/t/type_timestamp.test:
Add back test deleted during merge
sql/item_cmpfunc.cc:
After merge fixes
sql/item_func.cc:
Remove compiler warning
sql/mysql_priv.h:
After merge fixes
sql/mysqld.cc:
After merge fixes
sql/sql_acl.cc:
More debugging
sql/sql_base.cc:
After merge fixes
(This fix was needed bacause of multi-table-update reopens tables)
sql/sql_handler.cc:
After merge fixes
sql/sql_lex.h:
After merge fixes
sql/sql_select.cc:
After merge fixes
sql/sql_show.cc:
After merge fixes
sql/sql_table.cc:
After merge fixes
Simple cleanup of mysql_discard_or_import_tablespace
sql/sql_update.cc:
After merge fixes
Rework mysql_multi_update to take into account derived tables.
sql/sql_yacc.yy:
After merge fixes
Diffstat (limited to 'mysql-test/t/handler.test')
-rw-r--r-- | mysql-test/t/handler.test | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/mysql-test/t/handler.test b/mysql-test/t/handler.test index b7fe5d10297..3de8e8ae784 100644 --- a/mysql-test/t/handler.test +++ b/mysql-test/t/handler.test @@ -174,30 +174,34 @@ handler t1 open; # Check accesibility of all the tables. # use test; ---error 1109; +--error 1064 handler test.t1 read first limit 9; +--error 1064 handler test_test.t1 read first limit 9; handler t1 read first limit 9; +--error 1064 handler test_test.t2 read first limit 9; handler t2 read first limit 9; + # # Cleanup. # +--error 1064 handler test_test.t1 close; ---error 1109; handler t1 close; drop table test_test.t1; +--error 1064 handler test_test.t2 close; ---error 1109; handler t2 close; drop table test_test.t2; drop database test_test; + # use test; ---error 1109; +--error 1064 handler test.t1 close; ---error 1109; +--error 1109 handler t1 close; drop table test.t1; @@ -234,7 +238,7 @@ handler t2 open t1; --error 1066 handler t3 open t1; handler t1 read first limit 9; ---error 1109 +--error 1064 handler test.t1 close; --error 1066 handler test.t1 open h1; @@ -246,11 +250,11 @@ handler t1 read first limit 9; handler h1 read first limit 9; handler h2 read first limit 9; handler h3 read first limit 9; -handler test.h2 read first limit 9; ---error 1109 +handler h2 read first limit 9; +--error 1064 handler test.h1 close; -handler test_test.t1 close; -handler test_test.h1 close; +handler t1 close; +handler h1 close; handler h2 close; --error 1109 handler t1 read first limit 9; @@ -259,12 +263,12 @@ handler h1 read first limit 9; --error 1109 handler h2 read first limit 9; handler h3 read first limit 9; -handler test_test.h3 read first limit 9; +handler h3 read first limit 9; use test_test; handler h3 read first limit 9; ---error 1109 +--error 1064 handler test.h3 read first limit 9; -handler test_test.h3 close; +handler h3 close; use test; drop table t3; drop table t2; |