From 63c1731a64556e08cb81ca4385c72a6395911fd3 Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
Date: Fri, 17 Dec 2010 10:22:54 +0200
Subject: [PATCH] post-merge test result update

---
 mysql-test/r/fulltext.result | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
index 8c66156152..7788a32ac9 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/r/fulltext.result
@@ -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 >
-- 
2.30.9