From 5cd866610df606253827d5495343365af0cc9134 Mon Sep 17 00:00:00 2001
From: "serg@serg.mylan" <>
Date: Wed, 6 Apr 2005 23:12:10 +0200
Subject: after merge fix

---
 mysql-test/r/user_var.result | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'mysql-test/r/user_var.result')

diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result
index d36dca86e39..68eae111111 100644
--- a/mysql-test/r/user_var.result
+++ b/mysql-test/r/user_var.result
@@ -180,6 +180,5 @@ select coercibility(@v1),coercibility(@v2),coercibility(@v3),coercibility(@v4);
 coercibility(@v1)	coercibility(@v2)	coercibility(@v3)	coercibility(@v4)
 2	2	2	2
 set session @honk=99;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@honk=99' at line 1
 set one_shot @honk=99;
-ERROR HY000: The SET ONE_SHOT syntax is reserved for purposes internal to the MySQL server
+ERROR HY000: The 'SET ONE_SHOT' syntax is reserved for purposes internal to the MySQL server
-- 
cgit v1.2.1