MDEV-26635 ROW_NUMBER is not 0 for errors not caused because of rows

16 files changed, 97 insertions, 97 deletions

diff --git a/mysql-test/main/default.result b/mysql-test/main/default.result
index 51bf908162e..493101f10ee 100644
--- a/mysql-test/main/default.result
+++ b/mysql-test/main/default.result
@@ -799,7 +799,7 @@ ERROR 42000: Invalid default value for 'a'
 #
 CREATE TABLE t1 (a INT DEFAULT '1 ');
 Warnings:
-Note	1265	Data truncated for column 'a' at row 1
+Note	1265	Data truncated for column 'a' at row 0
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -812,7 +812,7 @@ a
 DROP TABLE t1;
 CREATE TABLE t1 (a INT DEFAULT CONCAT('1 '));
 Warnings:
-Note	1265	Data truncated for column 'a' at row 1
+Note	1265	Data truncated for column 'a' at row 0
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -827,7 +827,7 @@ a
 DROP TABLE t1;
 CREATE TABLE t1 (a INT DEFAULT COALESCE('1 '));
 Warnings:
-Note	1265	Data truncated for column 'a' at row 1
+Note	1265	Data truncated for column 'a' at row 0
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff --git a/mysql-test/main/get_diagnostics.result b/mysql-test/main/get_diagnostics.result
index c6c836cdc28..94ae31d5ee6 100644
--- a/mysql-test/main/get_diagnostics.result
+++ b/mysql-test/main/get_diagnostics.result
@@ -628,7 +628,7 @@ v
 NULL
 Warnings:
 Note	1050	Table 't1' already exists
-Error	1406	Data too long for column 'v' at row 1
+Error	1406	Data too long for column 'v' at row 0
 DROP TABLE t1;
 DROP PROCEDURE p1;
 
@@ -1476,7 +1476,7 @@ ERROR 42000: Column 'id1' specified twice
 GET DIAGNOSTICS CONDITION 1 @var118= ROW_NUMBER;
 SELECT @var118;
 @var118
-1
+0
 CREATE FUNCTION f1() RETURNS INT
 BEGIN
 INSERT INTO t1 VALUES (1);
@@ -1487,38 +1487,38 @@ ERROR HY000: Can't update table 't1' in stored function/trigger because it is al
 GET DIAGNOSTICS CONDITION 1 @var119= ROW_NUMBER;
 SELECT @var119;
 @var119
-1
+0
 INSERT INTO t1 VALUES (1) RETURNING id2;
 ERROR 42S22: Unknown column 'id2' in 'field list'
 GET DIAGNOSTICS CONDITION 1 @var120= ROW_NUMBER;
 SELECT @var120;
 @var120
-1
+0
 INSERT INTO t1(id2) VALUES(1);
 ERROR 42S22: Unknown column 'id2' in 'field list'
 GET DIAGNOSTICS CONDITION 1 @var121= ROW_NUMBER;
 SELECT @var121;
 @var121
-1
+0
 INSERT INTO v VALUES(1,2);
 ERROR HY000: Can not insert into join view 'test.v' without fields list
 GET DIAGNOSTICS CONDITION 1 @var122= ROW_NUMBER;
 SELECT @var122;
 @var122
-1
+0
 INSERT INTO v(a,b) VALUES (1,2);
 ERROR HY000: Can not modify more than one base table through a join view 'test.v'
 GET DIAGNOSTICS CONDITION 1 @var123= ROW_NUMBER;
 SELECT @var123;
 @var123
-1
+0
 # REPLACE STATEMENT
 REPLACE INTO t1(id1, id1) VALUES (1,1);
 ERROR 42000: Column 'id1' specified twice
 GET DIAGNOSTICS CONDITION 1 @var124= ROW_NUMBER;
 SELECT @var124;
 @var124
-1
+0
 CREATE FUNCTION f2() RETURNS INT
 BEGIN
 REPLACE INTO t1 VALUES (1);
@@ -1529,31 +1529,31 @@ ERROR HY000: Can't update table 't1' in stored function/trigger because it is al
 GET DIAGNOSTICS CONDITION 1 @var125= ROW_NUMBER;
 SELECT @var125;
 @var125
-1
+0
 REPLACE INTO t1 VALUES (1) RETURNING id2;
 ERROR 42S22: Unknown column 'id2' in 'field list'
 GET DIAGNOSTICS CONDITION 1 @var126= ROW_NUMBER;
 SELECT @var126;
 @var126
-1
+0
 REPLACE INTO t1(id2) VALUES(1);
 ERROR 42S22: Unknown column 'id2' in 'field list'
 GET DIAGNOSTICS CONDITION 1 @var127= ROW_NUMBER;
 SELECT @var127;
 @var127
-1
+0
 REPLACE INTO v VALUES(1,2);
 ERROR HY000: Can not insert into join view 'test.v' without fields list
 GET DIAGNOSTICS CONDITION 1 @var128= ROW_NUMBER;
 SELECT @var128;
 @var128
-1
+0
 REPLACE INTO v(a,b) VALUES (1,2);
 ERROR HY000: Can not modify more than one base table through a join view 'test.v'
 GET DIAGNOSTICS CONDITION 1 @var129= ROW_NUMBER;
 SELECT @var129;
 @var129
-1
+0
 DROP TABLE t1,t2;
 DROP FUNCTION f1;
 DROP FUNCTION f2;
@@ -1598,7 +1598,7 @@ ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
 GET DIAGNOSTICS CONDITION 1 @num = ROW_NUMBER, @msg = MESSAGE_TEXT;
 SELECT @num, @msg;
 @num	@msg
-2	Duplicate entry '1' for key 'PRIMARY'
+1	Duplicate entry '1' for key 'PRIMARY'
 DROP PROCEDURE sp;
 DROP TABLE t1;
 # Checking more errors
diff --git a/mysql-test/main/ps.result b/mysql-test/main/ps.result
index e595b6f8c21..c431f52afe4 100644
--- a/mysql-test/main/ps.result
+++ b/mysql-test/main/ps.result
@@ -5241,13 +5241,13 @@ DECLARE a DATETIME;
 CALL p1(a);
 END;
 $$
-ERROR 22007: Incorrect datetime value: '10' for column ``.``.`a` at row 1
+ERROR 22007: Incorrect datetime value: '10' for column ``.``.`a` at row 0
 BEGIN NOT ATOMIC
 DECLARE a DATETIME;
 EXECUTE IMMEDIATE 'CALL p1(?)' USING a;
 END;
 $$
-ERROR 22007: Incorrect datetime value: '10' for column ``.``.`a` at row 1
+ERROR 22007: Incorrect datetime value: '10' for column ``.``.`a` at row 0
 BEGIN NOT ATOMIC
 DECLARE a DATETIME;
 PREPARE stmt FROM 'CALL p1(?)';
@@ -5255,7 +5255,7 @@ EXECUTE stmt  USING a;
 DEALLOCATE PREPARE stmt;
 END;
 $$
-ERROR 22007: Incorrect datetime value: '10' for column ``.``.`a` at row 1
+ERROR 22007: Incorrect datetime value: '10' for column ``.``.`a` at row 0
 DROP PROCEDURE p1;
 #
 # MDEV-14454 Binary protocol returns wrong collation ID for SP OUT parameters
diff --git a/mysql-test/main/signal_sqlmode.result b/mysql-test/main/signal_sqlmode.result
index db7ac68041c..cb9bd4a8bba 100644
--- a/mysql-test/main/signal_sqlmode.result
+++ b/mysql-test/main/signal_sqlmode.result
@@ -32,7 +32,7 @@ call p;
 length(utf8_var)	utf8_var
 128	AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 Warnings:
-Warning	1265	Data truncated for column 'utf8_var' at row 1
+Warning	1265	Data truncated for column 'utf8_var' at row 0
 call p2;
 length(msg)	msg
 129	AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAX
@@ -71,7 +71,7 @@ table_name = name;
 end
 $$
 call p;
-ERROR 22001: Data too long for column 'utf8_var' at row 1
+ERROR 22001: Data too long for column 'utf8_var' at row 0
 call p2;
 length(msg)	msg
 513	AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAX
diff --git a/mysql-test/main/sp-anchor-type.result b/mysql-test/main/sp-anchor-type.result
index 9d339b8235c..ac867bd5ca3 100644
--- a/mysql-test/main/sp-anchor-type.result
+++ b/mysql-test/main/sp-anchor-type.result
@@ -62,7 +62,7 @@ CALL p1();
 a	b
 127	200
 Warnings:
-Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 0
 DROP PROCEDURE p1;
 DROP TABLE t1;
 SET sql_mode=DEFAULT;
diff --git a/mysql-test/main/sp-cursor.result b/mysql-test/main/sp-cursor.result
index 2656ef8821d..110ae7be03a 100644
--- a/mysql-test/main/sp-cursor.result
+++ b/mysql-test/main/sp-cursor.result
@@ -167,12 +167,12 @@ CALL p1('1b');
 v_a
 1
 Warnings:
-Warning	1265	Data truncated for column 'p_a' at row 1
+Warning	1265	Data truncated for column 'p_a' at row 0
 CALL p1('b1');
 v_a
 0
 Warnings:
-Warning	1366	Incorrect integer value: 'b1' for column ``.``.`p_a` at row 1
+Warning	1366	Incorrect integer value: 'b1' for column ``.``.`p_a` at row 0
 DROP PROCEDURE p1;
 SET sql_mode=DEFAULT;
 #
diff --git a/mysql-test/main/sp-error.result b/mysql-test/main/sp-error.result
index 3832d63c073..c77f58b6a66 100644
--- a/mysql-test/main/sp-error.result
+++ b/mysql-test/main/sp-error.result
@@ -2780,7 +2780,7 @@ END|
 
 CALL p1()|
 Warnings:
-Warning	1366	Incorrect integer value: 'string' for column ``.``.`var1` at row 1
+Warning	1366	Incorrect integer value: 'string' for column ``.``.`var1` at row 0
 
 SET sql_mode = DEFAULT|
 CREATE PROCEDURE p2()
diff --git a/mysql-test/main/sp-vars.result b/mysql-test/main/sp-vars.result
index a755f8e739f..de30156c602 100644
--- a/mysql-test/main/sp-vars.result
+++ b/mysql-test/main/sp-vars.result
@@ -110,7 +110,7 @@ v7	v8	v9	v10	v11	v12	v13	v14	v15	v16
 v17	v18	v19	v20
 12.00	12.12	12.00	12.12
 Warnings:
-Note	1265	Data truncated for column 'v20' at row 1
+Note	1265	Data truncated for column 'v20' at row 0
 CALL sp_vars_check_assignment();
 i1	i2	i3	i4
 127	-128	127	-128
@@ -130,22 +130,22 @@ SELECT sp_vars_check_ret1();
 sp_vars_check_ret1()
 127
 Warnings:
-Warning	1264	Out of range value for column 'sp_vars_check_ret1()' at row 1
+Warning	1264	Out of range value for column 'sp_vars_check_ret1()' at row 0
 SELECT sp_vars_check_ret2();
 sp_vars_check_ret2()
 127
 Warnings:
-Warning	1264	Out of range value for column 'sp_vars_check_ret2()' at row 1
+Warning	1264	Out of range value for column 'sp_vars_check_ret2()' at row 0
 SELECT sp_vars_check_ret3();
 sp_vars_check_ret3()
 0
 Warnings:
-Warning	1366	Incorrect integer value: 'Hello, world' for column ``.``.`sp_vars_check_ret3()` at row 1
+Warning	1366	Incorrect integer value: 'Hello, world' for column ``.``.`sp_vars_check_ret3()` at row 0
 SELECT sp_vars_check_ret4();
 sp_vars_check_ret4()
 154.12
 Warnings:
-Note	1265	Data truncated for column 'sp_vars_check_ret4()' at row 1
+Note	1265	Data truncated for column 'sp_vars_check_ret4()' at row 0
 SELECT sp_vars_div_zero();
 sp_vars_div_zero()
 NULL
@@ -165,7 +165,7 @@ v7	v8	v9	v10	v11	v12	v13	v14	v15	v16
 v17	v18	v19	v20
 12.00	12.12	12.00	12.12
 Warnings:
-Note	1265	Data truncated for column 'v20' at row 1
+Note	1265	Data truncated for column 'v20' at row 0
 CALL sp_vars_check_assignment();
 i1	i2	i3	i4
 127	-128	127	-128
@@ -185,22 +185,22 @@ SELECT sp_vars_check_ret1();
 sp_vars_check_ret1()
 127
 Warnings:
-Warning	1264	Out of range value for column 'sp_vars_check_ret1()' at row 1
+Warning	1264	Out of range value for column 'sp_vars_check_ret1()' at row 0
 SELECT sp_vars_check_ret2();
 sp_vars_check_ret2()
 127
 Warnings:
-Warning	1264	Out of range value for column 'sp_vars_check_ret2()' at row 1
+Warning	1264	Out of range value for column 'sp_vars_check_ret2()' at row 0
 SELECT sp_vars_check_ret3();
 sp_vars_check_ret3()
 0
 Warnings:
-Warning	1366	Incorrect integer value: 'Hello, world' for column ``.``.`sp_vars_check_ret3()` at row 1
+Warning	1366	Incorrect integer value: 'Hello, world' for column ``.``.`sp_vars_check_ret3()` at row 0
 SELECT sp_vars_check_ret4();
 sp_vars_check_ret4()
 154.12
 Warnings:
-Note	1265	Data truncated for column 'sp_vars_check_ret4()' at row 1
+Note	1265	Data truncated for column 'sp_vars_check_ret4()' at row 0
 SELECT sp_vars_div_zero();
 sp_vars_div_zero()
 NULL
@@ -306,20 +306,20 @@ Calling the routines, created in TRADITIONAL mode.
 ---------------------------------------------------------------
 
 CALL sp_vars_check_dflt();
-ERROR 22003: Out of range value for column 'v1' at row 1
+ERROR 22003: Out of range value for column 'v1' at row 0
 CALL sp_vars_check_assignment();
-ERROR 22003: Out of range value for column 'i1' at row 1
+ERROR 22003: Out of range value for column 'i1' at row 0
 SELECT sp_vars_check_ret1();
-ERROR 22003: Out of range value for column 'sp_vars_check_ret1()' at row 1
+ERROR 22003: Out of range value for column 'sp_vars_check_ret1()' at row 0
 SELECT sp_vars_check_ret2();
-ERROR 22003: Out of range value for column 'sp_vars_check_ret2()' at row 1
+ERROR 22003: Out of range value for column 'sp_vars_check_ret2()' at row 0
 SELECT sp_vars_check_ret3();
-ERROR 22007: Incorrect integer value: 'Hello, world' for column ``.``.`sp_vars_check_ret3()` at row 1
+ERROR 22007: Incorrect integer value: 'Hello, world' for column ``.``.`sp_vars_check_ret3()` at row 0
 SELECT sp_vars_check_ret4();
 sp_vars_check_ret4()
 154.12
 Warnings:
-Note	1265	Data truncated for column 'sp_vars_check_ret4()' at row 1
+Note	1265	Data truncated for column 'sp_vars_check_ret4()' at row 0
 SELECT sp_vars_div_zero();
 ERROR 22012: Division by 0
 SET @@sql_mode = 'ansi';
@@ -385,7 +385,7 @@ FF
 HEX(v10)
 FF
 Warnings:
-Warning	1264	Out of range value for column 'v5' at row 1
+Warning	1264	Out of range value for column 'v5' at row 0
 DROP PROCEDURE p1;
 
 ---------------------------------------------------------------
@@ -602,7 +602,7 @@ CALL p1('alpha', 'abcdef');
 x	y
 alpha	abc
 Warnings:
-Warning	1265	Data truncated for column 'y' at row 1
+Warning	1265	Data truncated for column 'y' at row 0
 DROP PROCEDURE p1;
 
 ---------------------------------------------------------------
@@ -628,7 +628,7 @@ t1	CREATE TABLE "t1" (
   "x" datetime DEFAULT NULL
 )
 Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
+Warning	1265	Data truncated for column 'x' at row 0
 DROP PROCEDURE p1;
 
 ---------------------------------------------------------------
@@ -777,17 +777,17 @@ SET var := arg;
 SELECT arg, var;
 END|
 CALL p1();
-ERROR 22003: Out of range value for column 'v' at row 1
+ERROR 22003: Out of range value for column 'v' at row 0
 CALL p2();
-ERROR 22003: Out of range value for column 'v' at row 1
+ERROR 22003: Out of range value for column 'v' at row 0
 CALL p3();
-ERROR 22001: Data too long for column 'v' at row 1
+ERROR 22001: Data too long for column 'v' at row 0
 CALL p4('aaa');
-ERROR 22001: Data too long for column 'arg' at row 1
+ERROR 22001: Data too long for column 'arg' at row 0
 CALL p5('aa');
-ERROR 22001: Data too long for column 'var' at row 1
+ERROR 22001: Data too long for column 'var' at row 0
 CALL p6(10);
-ERROR 22003: Out of range value for column 'var' at row 1
+ERROR 22003: Out of range value for column 'var' at row 0
 SET @@sql_mode = 'ansi';
 DROP PROCEDURE p1;
 DROP PROCEDURE p2;
@@ -817,7 +817,7 @@ CALL p1(1929.003);
 var
 1929.00
 Warnings:
-Note	1265	Data truncated for column 'arg' at row 1
+Note	1265	Data truncated for column 'arg' at row 0
 DROP PROCEDURE p1;
 
 ---------------------------------------------------------------
@@ -950,17 +950,17 @@ CALL p1('c');
 arg
 
 Warnings:
-Warning	1265	Data truncated for column 'arg' at row 1
+Warning	1265	Data truncated for column 'arg' at row 0
 CALL p2('a');
 arg	var
 a	
 Warnings:
-Warning	1265	Data truncated for column 'var' at row 1
+Warning	1265	Data truncated for column 'var' at row 0
 SELECT f1('a');
 f1('a')
 
 Warnings:
-Warning	1265	Data truncated for column 'f1('a')' at row 1
+Warning	1265	Data truncated for column 'f1('a')' at row 0
 DROP PROCEDURE p1;
 DROP PROCEDURE p2;
 DROP FUNCTION f1;
diff --git a/mysql-test/main/sp.result b/mysql-test/main/sp.result
index 26de728391a..df8cc323148 100644
--- a/mysql-test/main/sp.result
+++ b/mysql-test/main/sp.result
@@ -3073,14 +3073,14 @@ select bug9775('a'),bug9775('b'),bug9775('c')|
 bug9775('a')	bug9775('b')	bug9775('c')
 a	b	
 Warnings:
-Warning	1265	Data truncated for column 'bug9775('c')' at row 1
+Warning	1265	Data truncated for column 'bug9775('c')' at row 0
 drop function bug9775|
 create function bug9775(v1 int) returns enum('a','b') return v1|
 select bug9775(1),bug9775(2),bug9775(3)|
 bug9775(1)	bug9775(2)	bug9775(3)
 a	b	
 Warnings:
-Warning	1265	Data truncated for column 'bug9775(3)' at row 1
+Warning	1265	Data truncated for column 'bug9775(3)' at row 0
 drop function bug9775|
 create function bug9775(v1 char(1)) returns set('a','b') return v1|
 select bug9775('a'),bug9775('b'),bug9775('a,b'),bug9775('c')|
@@ -3088,14 +3088,14 @@ bug9775('a')	bug9775('b')	bug9775('a,b')	bug9775('c')
 a	b	a	
 Warnings:
 Warning	1265	Data truncated for column 'v1' at row 1
-Warning	1265	Data truncated for column 'bug9775('c')' at row 1
+Warning	1265	Data truncated for column 'bug9775('c')' at row 0
 drop function bug9775|
 create function bug9775(v1 int) returns set('a','b') return v1|
 select bug9775(1),bug9775(2),bug9775(3),bug9775(4)|
 bug9775(1)	bug9775(2)	bug9775(3)	bug9775(4)
 a	b	a,b	
 Warnings:
-Warning	1265	Data truncated for column 'bug9775(4)' at row 1
+Warning	1265	Data truncated for column 'bug9775(4)' at row 0
 drop function bug9775|
 drop function if exists bug8861|
 create function bug8861(v1 int) returns year return v1|
@@ -3118,10 +3118,10 @@ create procedure bug9004_2(x char(16))
 call bug9004_1(x)|
 call bug9004_1('12345678901234567')|
 Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
+Warning	1265	Data truncated for column 'x' at row 0
 call bug9004_2('12345678901234567890')|
 Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
+Warning	1265	Data truncated for column 'x' at row 0
 delete from t1|
 drop procedure bug9004_1|
 drop procedure bug9004_2|
@@ -4591,7 +4591,7 @@ call bug15231_3()|
 Result
 Missed it (correct)
 Level	Code	Message
-Warning	1366	Incorrect decimal value: 'zap' for column ``.``.`x` at row 1
+Warning	1366	Incorrect decimal value: 'zap' for column ``.``.`x` at row 0
 Result
 Caught it (correct)
 call bug15231_5()|
@@ -6438,7 +6438,7 @@ DROP TABLE t1;
 
 CALL p1('text');
 Warnings:
-Warning	1265	Data truncated for column 'v' at row 1
+Warning	1265	Data truncated for column 'v' at row 0
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -6458,7 +6458,7 @@ DROP TABLE t1;
 
 CALL p2('text');
 Warnings:
-Warning	1366	Incorrect integer value: 'text' for column ``.``.`v` at row 1
+Warning	1366	Incorrect integer value: 'text' for column ``.``.`v` at row 0
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -7070,10 +7070,10 @@ CALL p1(4, 'a');
 1
 1
 Warnings:
-Warning	1265	Data truncated for column 'b' at row 1
-Warning	1265	Data truncated for column 'b' at row 1
-Warning	1265	Data truncated for column 'b' at row 1
-Warning	1265	Data truncated for column 'b' at row 1
+Warning	1265	Data truncated for column 'b' at row 0
+Warning	1265	Data truncated for column 'b' at row 0
+Warning	1265	Data truncated for column 'b' at row 0
+Warning	1265	Data truncated for column 'b' at row 0
 SET @@max_sp_recursion_depth= @save_max_sp_recursion;
 DROP PROCEDURE p1;
 DROP PROCEDURE IF EXISTS p1;
@@ -7091,7 +7091,7 @@ CAST('10 ' as UNSIGNED INTEGER)
 1
 1
 Warnings:
-Warning	1265	Data truncated for column 'a' at row 1
+Warning	1265	Data truncated for column 'a' at row 0
 Note	1292	Truncated incorrect INTEGER value: '10 '
 DROP PROCEDURE p1;
 DROP PROCEDURE IF EXISTS p1;
@@ -7144,7 +7144,7 @@ SELECT f1();
 f1()
 a
 Warnings:
-Warning	1265	Data truncated for column 'f4()' at row 1
+Warning	1265	Data truncated for column 'f4()' at row 0
 DROP FUNCTION f1;
 DROP FUNCTION f2;
 DROP FUNCTION f3;
diff --git a/mysql-test/main/trigger.result b/mysql-test/main/trigger.result
index 1bf07c25c58..8065f7f5ac4 100644
--- a/mysql-test/main/trigger.result
+++ b/mysql-test/main/trigger.result
@@ -2321,7 +2321,7 @@ END;
 |
 SET @@session.sql_mode = default;
 INSERT INTO t1 VALUES ('a'),('b');
-ERROR 22001: Data too long for column 'c' at row 1
+ERROR 22001: Data too long for column 'c' at row 0
 show create trigger t1_bi;
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
 t1_bi	STRICT_TRANS_TABLES,STRICT_ALL_TABLES	CREATE DEFINER=`root`@`localhost` TRIGGER t1_bi
diff --git a/mysql-test/main/type_date.result b/mysql-test/main/type_date.result
index 926ed1a8393..e59e60de0a7 100644
--- a/mysql-test/main/type_date.result
+++ b/mysql-test/main/type_date.result
@@ -391,7 +391,7 @@ call test5041();
 d
 2013-09-21
 Warnings:
-Note	1265	Data truncated for column 'd' at row 1
+Note	1265	Data truncated for column 'd' at row 0
 drop procedure test5041;
 SET @@timestamp=DEFAULT;
 #
diff --git a/mysql-test/main/type_datetime.result b/mysql-test/main/type_datetime.result
index 3c1baf82167..77d77d218f0 100644
--- a/mysql-test/main/type_datetime.result
+++ b/mysql-test/main/type_datetime.result
@@ -199,7 +199,7 @@ CAST(CAST('10:11:12.098700' AS TIME(6)) AS DECIMAL(20,6))
 set @org_mode=@@sql_mode;
 create table t1 (da date default '1962-03-03 23:33:34', dt datetime default '1962-03-03');
 Warnings:
-Note	1265	Data truncated for column 'da' at row 1
+Note	1265	Data truncated for column 'da' at row 0
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -595,7 +595,7 @@ End of 5.0 tests
 set @org_mode=@@sql_mode;
 create table t1 (da date default '1962-03-03 23:33:34', dt datetime default '1962-03-03');
 Warnings:
-Note	1265	Data truncated for column 'da' at row 1
+Note	1265	Data truncated for column 'da' at row 0
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff --git a/mysql-test/main/type_decimal.result b/mysql-test/main/type_decimal.result
index 70367ef246c..7bf3b52970a 100644
--- a/mysql-test/main/type_decimal.result
+++ b/mysql-test/main/type_decimal.result
@@ -1091,7 +1091,7 @@ a
 Warnings:
 Warning	1916	Got overflow when converting '' to DECIMAL. Value truncated
 Warning	1292	Truncated incorrect DECIMAL value: '.00000000000000000000000000000000000001e111111111111111111111'
-Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 0
 CREATE TABLE t1 (str VARCHAR(128), comment VARCHAR(128));
 INSERT INTO t1 VALUES
 ('0e111111111111111111111', 'Zero mantissa and a huge positive exponent'),
diff --git a/mysql-test/main/type_newdecimal.result b/mysql-test/main/type_newdecimal.result
index 5b4b5d569a5..c55938eebf1 100644
--- a/mysql-test/main/type_newdecimal.result
+++ b/mysql-test/main/type_newdecimal.result
@@ -956,14 +956,14 @@ f6 decimal unsigned not null default 199.91,
 f7 decimal unsigned not null default 999.9, 
 f8 decimal unsigned not null default 9999.99);
 Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Note	1265	Data truncated for column 'f2' at row 1
-Note	1265	Data truncated for column 'f3' at row 1
-Note	1265	Data truncated for column 'f4' at row 1
-Note	1265	Data truncated for column 'f5' at row 1
-Note	1265	Data truncated for column 'f6' at row 1
-Note	1265	Data truncated for column 'f7' at row 1
-Note	1265	Data truncated for column 'f8' at row 1
+Note	1265	Data truncated for column 'f1' at row 0
+Note	1265	Data truncated for column 'f2' at row 0
+Note	1265	Data truncated for column 'f3' at row 0
+Note	1265	Data truncated for column 'f4' at row 0
+Note	1265	Data truncated for column 'f5' at row 0
+Note	1265	Data truncated for column 'f6' at row 0
+Note	1265	Data truncated for column 'f7' at row 0
+Note	1265	Data truncated for column 'f8' at row 0
 insert into t1 (f1) values (1);
 select * from t1;
 f1	f2	f3	f4	f5	f6	f7	f8
@@ -2292,7 +2292,7 @@ a
 DROP TABLE t1;
 CREATE TABLE t1 (a DECIMAL(2,1) DEFAULT '1e-10000');
 Warnings:
-Note	1265	Data truncated for column 'a' at row 1
+Note	1265	Data truncated for column 'a' at row 0
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -2301,7 +2301,7 @@ t1	CREATE TABLE `t1` (
 DROP TABLE t1;
 CREATE TABLE t1 (a DECIMAL(2,1) DEFAULT '0.1 ');
 Warnings:
-Note	1265	Data truncated for column 'a' at row 1
+Note	1265	Data truncated for column 'a' at row 0
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -2310,7 +2310,7 @@ t1	CREATE TABLE `t1` (
 DROP TABLE t1;
 CREATE TABLE t1 (a DECIMAL(2,1) DEFAULT '0.10001 ');
 Warnings:
-Note	1265	Data truncated for column 'a' at row 1
+Note	1265	Data truncated for column 'a' at row 0
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -2319,7 +2319,7 @@ t1	CREATE TABLE `t1` (
 DROP TABLE t1;
 CREATE TABLE t1 (a DECIMAL(2,1) DEFAULT '0.10001');
 Warnings:
-Note	1265	Data truncated for column 'a' at row 1
+Note	1265	Data truncated for column 'a' at row 0
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -2328,7 +2328,7 @@ t1	CREATE TABLE `t1` (
 DROP TABLE t1;
 CREATE TABLE t1 (a DECIMAL(2,1) DEFAULT 0.10001);
 Warnings:
-Note	1265	Data truncated for column 'a' at row 1
+Note	1265	Data truncated for column 'a' at row 0
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -2337,7 +2337,7 @@ t1	CREATE TABLE `t1` (
 DROP TABLE t1;
 CREATE TABLE t1 (a DECIMAL(2,1) DEFAULT 0.10001e0);
 Warnings:
-Note	1265	Data truncated for column 'a' at row 1
+Note	1265	Data truncated for column 'a' at row 0
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff --git a/mysql-test/main/type_time_hires.result b/mysql-test/main/type_time_hires.result
index c7fecbef76b..661ca0e98f5 100644
--- a/mysql-test/main/type_time_hires.result
+++ b/mysql-test/main/type_time_hires.result
@@ -271,8 +271,8 @@ create table t1 (a time(6), b time(6));
 create procedure foo(x time, y time(4)) insert into t1 values (x, y);
 call foo('2010-02-03 4:5:6.789123', '2010-02-03 4:5:6.789123');
 Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'x' at row 0
+Note	1265	Data truncated for column 'y' at row 0
 select * from t1;
 a	b
 04:05:06.000000	04:05:06.789100
@@ -284,7 +284,7 @@ insert t1 values (b, c + interval a microsecond);
 end|
 call bar(1111111, '2011-01-02 3:4:5.123456');
 Warnings:
-Note	1265	Data truncated for column 'c' at row 1
+Note	1265	Data truncated for column 'c' at row 0
 select * from t1;
 a	b
 04:05:06.000000	04:05:06.789100
@@ -297,7 +297,7 @@ select xyz('1:1:1.010101');
 xyz('1:1:1.010101')
 11:11:11.1111
 Warnings:
-Note	1265	Data truncated for column 'xyz('1:1:1.010101')' at row 1
+Note	1265	Data truncated for column 'xyz('1:1:1.010101')' at row 0
 drop function xyz;
 create view v1 as select * from t1 group by a,b;
 select * from v1;
diff --git a/mysql-test/main/type_varchar.result b/mysql-test/main/type_varchar.result
index e42a363a2c2..cfc8218b8ab 100644
--- a/mysql-test/main/type_varchar.result
+++ b/mysql-test/main/type_varchar.result
@@ -710,14 +710,14 @@ CREATE TABLE t1 (c VARCHAR(1) DEFAULT 'foo');
 ERROR 42000: Invalid default value for 'c'
 SHOW WARNINGS;
 Level	Code	Message
-Warning	1265	Data truncated for column 'c' at row 1
+Warning	1265	Data truncated for column 'c' at row 0
 Error	1067	Invalid default value for 'c'
 SET sql_mode='STRICT_ALL_TABLES';
 CREATE TABLE t1 (c VARCHAR(1) DEFAULT 'foo');
 ERROR 42000: Invalid default value for 'c'
 SHOW WARNINGS;
 Level	Code	Message
-Warning	1265	Data truncated for column 'c' at row 1
+Warning	1265	Data truncated for column 'c' at row 0
 Error	1067	Invalid default value for 'c'
 CREATE TABLE t1 (c VARCHAR(1));
 SET sql_mode='';
@@ -725,14 +725,14 @@ ALTER TABLE t1 ALTER column c SET DEFAULT 'foo';
 ERROR 42000: Invalid default value for 'c'
 SHOW WARNINGS;
 Level	Code	Message
-Warning	1265	Data truncated for column 'c' at row 1
+Warning	1265	Data truncated for column 'c' at row 0
 Error	1067	Invalid default value for 'c'
 SET sql_mode='STRICT_ALL_TABLES';
 ALTER TABLE t1 ALTER column c SET DEFAULT 'foo';
 ERROR 42000: Invalid default value for 'c'
 SHOW WARNINGS;
 Level	Code	Message
-Warning	1265	Data truncated for column 'c' at row 1
+Warning	1265	Data truncated for column 'c' at row 0
 Error	1067	Invalid default value for 'c'
 DROP TABLE t1;
 SET sql_mode=DEFAULT;