summaryrefslogtreecommitdiff
path: root/mysql-test/r/warnings.result
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/r/warnings.result')
-rw-r--r--mysql-test/r/warnings.result24
1 files changed, 12 insertions, 12 deletions
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result
index 19d44ab6fea..d883feb7ce2 100644
--- a/mysql-test/r/warnings.result
+++ b/mysql-test/r/warnings.result
@@ -43,13 +43,13 @@ 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 ',';
Warnings:
-Warning 1263 Data truncated, NULL supplied to NOT NULL column 'b' at row 2
+Warning 1263 Data truncated; NULL supplied to NOT NULL column 'b' at row 2
Warning 1265 Data truncated for column 'd' at row 3
Warning 1265 Data truncated for column 'c' at row 4
Warning 1261 Row 5 doesn't contain data for all columns
Warning 1265 Data truncated for column 'b' at row 6
-Warning 1262 Row 7 was truncated; It contained more data than there were input columns
-Warning 1264 Data truncated, out of range for column 'a' at row 8
+Warning 1262 Row 7 was truncated; it contained more data than there were input columns
+Warning 1264 Data truncated; out of range for column 'a' at row 8
select @@warning_count;
@@warning_count
7
@@ -57,11 +57,11 @@ drop table t1;
create table t1(a tinyint NOT NULL, b tinyint unsigned, c char(5));
insert into t1 values(NULL,100,'mysql'),(10,-1,'mysql ab'),(500,256,'open source'),(20,NULL,'test');
Warnings:
-Warning 1263 Data truncated, NULL supplied to NOT NULL column 'a' at row 1
-Warning 1264 Data truncated, out of range for column 'b' at row 2
+Warning 1263 Data truncated; NULL supplied to NOT NULL column 'a' at row 1
+Warning 1264 Data truncated; out of range for column 'b' at row 2
Warning 1265 Data truncated for column 'c' at row 2
-Warning 1264 Data truncated, out of range for column 'a' at row 3
-Warning 1264 Data truncated, out of range for column 'b' at row 3
+Warning 1264 Data truncated; out of range for column 'a' at row 3
+Warning 1264 Data truncated; out of range for column 'b' at row 3
Warning 1265 Data truncated for column 'c' at row 3
alter table t1 modify c char(4);
Warnings:
@@ -70,7 +70,7 @@ Warning 1265 Data truncated for column 'c' at row 2
alter table t1 add d char(2);
update t1 set a=NULL where a=10;
Warnings:
-Warning 1263 Data truncated, NULL supplied to NOT NULL column 'a' at row 2
+Warning 1263 Data truncated; NULL supplied to NOT NULL column 'a' at row 2
update t1 set c='mysql ab' where c='test';
Warnings:
Warning 1265 Data truncated for column 'c' at row 4
@@ -86,7 +86,7 @@ Warnings:
Warning 1265 Data truncated for column 'b' at row 1
Warning 1265 Data truncated for column 'b' at row 2
Warning 1265 Data truncated for column 'b' at row 3
-Warning 1263 Data truncated, NULL supplied to NOT NULL column 'a' at row 4
+Warning 1263 Data truncated; NULL supplied to NOT NULL column 'a' at row 4
Warning 1265 Data truncated for column 'b' at row 4
insert into t2(b) values('mysqlab');
Warnings:
@@ -125,11 +125,11 @@ Warning 1266 Using storage engine MyISAM for table 't1'
drop table t1;
create table t1 (id int) type=heap;
Warnings:
-Warning 1287 'TYPE=storage_engine' is deprecated, use 'ENGINE=storage_engine' instead
+Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
alter table t1 type=myisam;
Warnings:
-Warning 1287 'TYPE=storage_engine' is deprecated, use 'ENGINE=storage_engine' instead
+Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
drop table t1;
set table_type=MYISAM;
Warnings:
-Warning 1287 'table_type' is deprecated, use 'storage_engine' instead
+Warning 1287 'table_type' is deprecated; use 'storage_engine' instead