summaryrefslogtreecommitdiff
path: root/mysql-test/r/ps_6bdb.result
diff options
context:
space:
mode:
authorunknown <tsmith@siva.hindu.god>2007-05-17 12:55:59 -0600
committerunknown <tsmith@siva.hindu.god>2007-05-17 12:55:59 -0600
commitdb18dc9da096bdd0adf5d8b89896d6b041ee7f30 (patch)
tree3460064a9c97eb1180d322a57792a79fc4036147 /mysql-test/r/ps_6bdb.result
parentbcae429e91860551a6acbcbd5bc6811b3c5a7372 (diff)
downloadmariadb-git-db18dc9da096bdd0adf5d8b89896d6b041ee7f30.tar.gz
ps_6bdb.result:
Fix bad merge of test results mysql-test/r/ps_6bdb.result: Fix bad merge of test results
Diffstat (limited to 'mysql-test/r/ps_6bdb.result')
-rw-r--r--mysql-test/r/ps_6bdb.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ps_6bdb.result b/mysql-test/r/ps_6bdb.result
index e225ddea7d8..3dc5859d304 100644
--- 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