database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix merge conflict by changing warning codes to new one

Browse Source 
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
This commit is contained in:
unknown
2003-05-21 01:21:06 -07:00
parent 06b60afc19
commit 927a0c185c
4 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/create.result
View File

@ -272,7 +272,7 @@ SELECT @@table_type;
GEMINI
CREATE TABLE t1 (a int not null);
Warnings:
Warning 1259 Using storage engine MYISAM for table 't1'
Warning 1264 Using storage engine MYISAM for table 't1'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (