summaryrefslogtreecommitdiff
path: root/mysql-test/r/create.result
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-01-27 22:35:04 +0300
committerAlexander Nozdrin <alik@sun.com>2010-01-27 22:35:04 +0300
commit32ab87c385520f718f7334d9a693c33850cfec83 (patch)
tree0978088da05e633ea116ccd85fb81903fa9214fa /mysql-test/r/create.result
parent269822506d8f03d8527eabdbf1bce0e1a0e24513 (diff)
parent6f380d1650ad123c61640522cb5274eb143a5fa9 (diff)
downloadmariadb-git-32ab87c385520f718f7334d9a693c33850cfec83.tar.gz
Auto-merge from mysql-trunk-merge.
Diffstat (limited to 'mysql-test/r/create.result')
-rw-r--r--mysql-test/r/create.result7
1 files changed, 2 insertions, 5 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 019aeba27b6..55e8e15b6a9 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -820,16 +820,13 @@ i
drop table t1;
create temporary table t1 (j int);
create table if not exists t1 select 1;
-Warnings:
-Note 1050 Table 't1' already exists
select * from t1;
j
-1
drop temporary table t1;
select * from t1;
-ERROR 42S02: Table 'test.t1' doesn't exist
+1
+1
drop table t1;
-ERROR 42S02: Unknown table 't1'
create table t1 (i int);
insert into t1 values (1), (2);
lock tables t1 read;