summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-05-16 13:36:17 +0300
committerunknown <monty@mysql.com>2005-05-16 13:36:17 +0300
commitb9a4e7d88eabba5b7463da899d1a72a264a84093 (patch)
treec1ab6baebf728ace412e7e76cf1505d5744a283b /mysql-test/r
parent70686e252aaf54ccc5367445b138048e617f2972 (diff)
parent70c4325d67256c44c47d41b7ef68ef5e7e9a3751 (diff)
downloadmariadb-git-b9a4e7d88eabba5b7463da899d1a72a264a84093.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/my/mysql-5.0 sql/sql_select.cc: Auto merged
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/ps.result1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index c84c62442ef..8371437d664 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -1,4 +1,5 @@
drop table if exists t1,t2;
+drop database if exists client_test_db;
create table t1
(
a int primary key,