summaryrefslogtreecommitdiff
path: root/mysql-test/r/user_var.result
diff options
context:
space:
mode:
authorserg@serg.mylan <>2005-04-06 23:12:10 +0200
committerserg@serg.mylan <>2005-04-06 23:12:10 +0200
commit5cd866610df606253827d5495343365af0cc9134 (patch)
tree263f1e6f72b80f3bf548474ea002eb8969128eb3 /mysql-test/r/user_var.result
parente1e5b97dea1ec945939a711e31ff7e0bb73dd3e9 (diff)
downloadmariadb-git-5cd866610df606253827d5495343365af0cc9134.tar.gz
after merge fix
Diffstat (limited to 'mysql-test/r/user_var.result')
-rw-r--r--mysql-test/r/user_var.result3
1 files changed, 1 insertions, 2 deletions
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