summaryrefslogtreecommitdiff
path: root/mysql-test/t/user_var.test
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-02-22 15:47:00 +0200
committermonty@mysql.com <>2005-02-22 15:47:00 +0200
commite2ea35ec673747925780b2ad44f2b3c0a2a7961a (patch)
tree775f6aaae95a3574b8d285d2433c3797b653e482 /mysql-test/t/user_var.test
parentf55e2002484b822851b5ce26e65eb82c0caed5f5 (diff)
parent5e6ba9dec8f3f82745e657a2f64564ef0c5e2348 (diff)
downloadmariadb-git-e2ea35ec673747925780b2ad44f2b3c0a2a7961a.tar.gz
Merge with 4.1
Diffstat (limited to 'mysql-test/t/user_var.test')
-rw-r--r--mysql-test/t/user_var.test2
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/t/user_var.test b/mysql-test/t/user_var.test
index 5dc24bde21f..07076f1f6f4 100644
--- a/mysql-test/t/user_var.test
+++ b/mysql-test/t/user_var.test
@@ -85,7 +85,6 @@ select @a=_latin2'TEST' collate latin2_bin;
set @a=_latin2'test' collate latin2_general_ci;
select charset(@a),collation(@a),coercibility(@a);
select @a=_latin2'TEST';
---error 1267
select @a=_latin2'TEST' collate latin2_bin;
#
@@ -98,7 +97,6 @@ select collation(@a:=_latin2'test' collate latin2_bin);
select coercibility(@a:=_latin2'test' collate latin2_bin);
select (@a:=_latin2'test' collate latin2_bin) = _latin2'TEST';
select charset(@a),collation(@a),coercibility(@a);
---error 1267
select (@a:=_latin2'test' collate latin2_bin) = _latin2'TEST' collate latin2_general_ci;
# Check that user variables are binlogged correctly (BUG#3875)