bzr commit into mysql-5.5-bugteam branch (Georgi.Kodinov:3205)

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/work/merge-5.5-bugteam/ based on revid:georgi.kodinov@stripped

 3205 Georgi Kodinov	2010-12-17
      post-merge test result update

    modified:
      mysql-test/r/fulltext.result
=== modified file 'mysql-test/r/fulltext.result'
--- a/mysql-test/r/fulltext.result	2010-12-16 16:44:17 +0000
+++ b/mysql-test/r/fulltext.result	2010-12-17 08:22:54 +0000
@@ -663,9 +663,6 @@ ON (MATCH(t1.f1) against (""))
 WHERE t1.f1 GROUP BY t1.f1)) xor f1;
 1
 1
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'test'
-Warning	1292	Truncated incorrect INTEGER value: 'test'
 PREPARE stmt FROM
 'SELECT 1 FROM t1 WHERE 1 >
  ALL((SELECT 1 FROM t1 RIGHT OUTER JOIN t1 a
@@ -674,15 +671,9 @@ PREPARE stmt FROM
 EXECUTE stmt;
 1
 1
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'test'
-Warning	1292	Truncated incorrect INTEGER value: 'test'
 EXECUTE stmt;
 1
 1
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'test'
-Warning	1292	Truncated incorrect INTEGER value: 'test'
 DEALLOCATE PREPARE stmt;
 PREPARE stmt FROM
 'SELECT 1 FROM t1 WHERE 1 >


Attachment: [text/bzr-bundle] bzr/[e-mail]