summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <lars@mysql.com>2005-02-22 13:39:41 +0100
committerunknown <lars@mysql.com>2005-02-22 13:39:41 +0100
commit29b4d186cbe5f4558016ba43b7aaebbc7aa7dd60 (patch)
tree47fa05bd4f69cea4b38613166a85fc7123961d22 /mysql-test/r
parent6f6bf32afa7aa2876f1ab5e555438f7baf514d42 (diff)
parenta7b6d0c23224bc7192363320e933bbc1936e1e5d (diff)
downloadmariadb-git-29b4d186cbe5f4558016ba43b7aaebbc7aa7dd60.tar.gz
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/rpl_charset.result7
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/rpl_charset.result b/mysql-test/r/rpl_charset.result
index cab41344238..292cfb19175 100644
--- a/mysql-test/r/rpl_charset.result
+++ b/mysql-test/r/rpl_charset.result
@@ -207,3 +207,10 @@ select hex(c1), hex(c2) from t1;
hex(c1) hex(c2)
CDF32C20E7E020F0FBE1E0EBEAF3 CDF32C20E7E020F0FBE1E0EBEAF3
drop table t1;
+create table `t1` (
+`pk` varchar(10) not null default '',
+primary key (`pk`)
+) engine=myisam default charset=latin1;
+set @p=_latin1 'test';
+update t1 set pk='test' where pk=@p;
+drop table t1;