summaryrefslogtreecommitdiff
path: root/mysql-test/r/select.result
diff options
context:
space:
mode:
authortsmith@maint1.mysql.com <>2007-06-26 13:15:43 +0200
committertsmith@maint1.mysql.com <>2007-06-26 13:15:43 +0200
commit26398867119f06a05dbf6cb6412fca4f20cda52a (patch)
tree8e814588deea22ca36d9f472a2e95e47d92aa8a9 /mysql-test/r/select.result
parent79677b756efa3ddfb2c835145f27d2cebc948a0e (diff)
downloadmariadb-git-26398867119f06a05dbf6cb6412fca4f20cda52a.tar.gz
Bug #29245: Bad Merge Caused Error Codes Conflict between 5.0/5.1
Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
Diffstat (limited to 'mysql-test/r/select.result')
-rw-r--r--mysql-test/r/select.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index 92ceca2162f..a148d1029df 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -3492,7 +3492,7 @@ SELECT 0.9888889889 * 1.011111411911;
0.9998769417899202067879
prepare stmt from 'select 1 as " a "';
Warnings:
-Warning 1548 Leading spaces are removed from name ' a '
+Warning 1466 Leading spaces are removed from name ' a '
execute stmt;
a
1