diff options
| author | unknown <serg@serg.mylan> | 2004-03-18 11:04:36 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-03-18 11:04:36 +0100 |
| commit | ee63578fe23de54912074e8d976ca734681baab2 (patch) | |
| tree | ca8da9ee200ffdf7ac8bb4c593adbfea620ea4a9 /mysql-test | |
| parent | 93ca1bfac6d5607cba6775e20e8f302ad0faf9b8 (diff) | |
| parent | 84b256013b7831e84d584f9c23efcd5623588129 (diff) | |
| download | mariadb-git-ee63578fe23de54912074e8d976ca734681baab2.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
sql/sql_db.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/drop.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/drop.test | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/drop.result b/mysql-test/r/drop.result index 3748af1b8f9..ca13f22e1eb 100644 --- a/mysql-test/r/drop.result +++ b/mysql-test/r/drop.result @@ -21,6 +21,7 @@ select * from mysqltest.mysqltest; n 4 drop database if exists mysqltest; +affected rows: 4 create database mysqltest; drop database mysqltest; flush tables with read lock; diff --git a/mysql-test/t/drop.test b/mysql-test/t/drop.test index 43329a849f8..88c47803f48 100644 --- a/mysql-test/t/drop.test +++ b/mysql-test/t/drop.test @@ -24,7 +24,9 @@ create database mysqltest; create table mysqltest.mysqltest (n int); insert into mysqltest.mysqltest values (4); select * from mysqltest.mysqltest; +--enable_info drop database if exists mysqltest; +--disable_info create database mysqltest; drop database mysqltest; |