diff options
| author | unknown <venu@myvenu.com> | 2003-05-21 01:21:06 -0700 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2003-05-21 01:21:06 -0700 |
| commit | 927a0c185c933ec5cccb97bd110da4d05ce82e0e (patch) | |
| tree | 5caccb610827248c4e9755d600d633cbb4d22d85 /mysql-test/r/warnings.result | |
| parent | 06b60afc198d045b602bfc122c9112610e75271f (diff) | |
| download | mariadb-git-927a0c185c933ec5cccb97bd110da4d05ce82e0e.tar.gz | |
Fix merge conflict by changing warning codes to new one
mysql-test/t/warnings.test:
Fix merge conflict by changing warning code
mysql-test/r/create.result:
Fix merge conflict
mysql-test/r/warnings.result:
Fix merge conflict
sql/share/english/errmsg.txt:
Fix the merge conflict
Diffstat (limited to 'mysql-test/r/warnings.result')
| -rw-r--r-- | mysql-test/r/warnings.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index 5920c87d20a..add9051ddfb 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -109,6 +109,7 @@ Warning 1263 Data truncated for column 'b' at row 10 select @@warning_count; @@warning_count 50 +drop table t1; create table t1 (id int) type=isam; Warnings: Warning 1264 Using storage engine MYISAM for table 't1' |