diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-09-12 20:18:49 +0300 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-09-12 20:18:49 +0300 |
| commit | 8c3423652deeaeae02261ecd12cb5428db4072bc (patch) | |
| tree | cc28287d4e3a1d922ebc277929fd7e9d0ff264fa /mysql-test/r/temp_table.result | |
| parent | 4efcca023b47e9d8fff148da2c65254ddbee6c9b (diff) | |
| parent | 17233698fcf91f482419ece675f2d747fae9f501 (diff) | |
| download | mariadb-git-8c3423652deeaeae02261ecd12cb5428db4072bc.tar.gz | |
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
mysql-test/r/temp_table.result:
Auto merged
mysql-test/r/warnings.result:
Auto merged
sql/sql_db.cc:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/filesort.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/create.result:
Merged from 4.1 to 5.0
mysql-test/r/innodb.result:
Merged from 4.1 to 5.0
mysql-test/t/create.test:
Merged from 4.1 to 5.0
sql/item_cmpfunc.cc:
Merged from 4.1 to 5.0
sql/sql_table.cc:
Merged from 4.1 to 5.0
Diffstat (limited to 'mysql-test/r/temp_table.result')
| -rw-r--r-- | mysql-test/r/temp_table.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/temp_table.result b/mysql-test/r/temp_table.result index 081bd35622e..1b7e3927adb 100644 --- a/mysql-test/r/temp_table.result +++ b/mysql-test/r/temp_table.result @@ -23,6 +23,8 @@ a b 6 g create TEMPORARY TABLE t2 engine=heap select * from t1; create TEMPORARY TABLE IF NOT EXISTS t2 (a int) engine=heap; +Warnings: +Note 1050 Table 't2' already exists CREATE TEMPORARY TABLE t1 (a int not null, b char (10) not null); ERROR 42S01: Table 't1' already exists ALTER TABLE t1 RENAME t2; |