diff options
author | unknown <tomas@poseidon.(none)> | 2004-09-06 10:47:04 +0000 |
---|---|---|
committer | unknown <tomas@poseidon.(none)> | 2004-09-06 10:47:04 +0000 |
commit | 862d056d4a238c580f01d662f9533bb86894fc63 (patch) | |
tree | c0284b46721f242643e099825453df1d77d31438 /mysql-test/t/ps_1general.test | |
parent | c7e942a8ff90fe6100518361129209a7cd5ab48d (diff) | |
parent | 3d390679e41f69a1b8d1c8b0599fac93ae16ac07 (diff) | |
download | mariadb-git-862d056d4a238c580f01d662f9533bb86894fc63.tar.gz |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb
sql/sql_class.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/ps_1general.test')
-rw-r--r-- | mysql-test/t/ps_1general.test | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test index 2c86c30f820..084253a106a 100644 --- a/mysql-test/t/ps_1general.test +++ b/mysql-test/t/ps_1general.test @@ -350,11 +350,11 @@ prepare stmt4 from ' use test ' ; ## create/drop database --error 1295 -prepare stmt3 from ' create database drop_me '; -create database drop_me ; +prepare stmt3 from ' create database mysqltest '; +create database mysqltest ; --error 1295 -prepare stmt3 from ' drop database drop_me '; -drop database drop_me ; +prepare stmt3 from ' drop database mysqltest '; +drop database mysqltest ; ## grant/revoke + drop user --error 1295 |