Merge damien-katzs-computer.local:/Users/dkatz/mysql50

into damien-katzs-computer.local:/Users/dkatz/50_div_zero

Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into damien-katzs-computer.local:/Users/dkatz/50_div_zero
1155afff · unknown · 3770083b · db18dc9d · 1155afff
Commit 1155afff authored May 17, 2007 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/r/ps_6bdb.result mysql-test/r/ps_6bdb.result +1 -1

No files found.
--- a/mysql-test/r/ps_6bdb.result
+++ b/mysql-test/r/ps_6bdb.result
@@ -2990,11 +2990,11 @@ Warning	1265	Data truncated for column 'c15' at row 1
 Warning	1264	Out of range value adjusted for column 'c16' at row 1
 Warning	1264	Out of range value adjusted for column 'c17' at row 1
 Warnings:
-Note	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
 Warning	1264	Out of range value adjusted for column 'c16' at row 1
 Warning	1264	Out of range value adjusted for column 'c17' at row 1
 Warnings:
+Note	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
 Warning	1264	Out of range value adjusted for column 'c16' at row 1
 Warning	1264	Out of range value adjusted for column 'c17' at row 1