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/warnings.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/warnings.result')
| -rw-r--r-- | mysql-test/r/warnings.result | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index fd516996ae8..d8329e446ac 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -63,9 +63,11 @@ show count(*) warnings; 1 create table t1(id int); create table if not exists t1(id int); +Warnings: +Note 1050 Table 't1' already exists select @@warning_count; @@warning_count -0 +1 drop table t1; create table t1(a tinyint, b int not null, c date, d char(5)); load data infile '../../std_data/warnings_loaddata.dat' into table t1 fields terminated by ','; |