mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 03:47:17 +02:00
Code Issues Projects Releases Packages Wiki 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
commit 927a0c185c
4 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/r/warnings.result
View file

@ -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'