diff options
| author | unknown <serg@serg.mylan> | 2004-03-20 14:36:49 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-03-20 14:36:49 +0100 |
| commit | b399754780edce812991b36d108af48bf581f4c4 (patch) | |
| tree | 7d10c171fbae38cd4e88982318b15e415cdb9beb /mysql-test | |
| parent | 2d20eddcbbfdac3403313f860464937d4250eb8e (diff) | |
| parent | eb3ded5665fa43e616d8e02f4a63805848c3747b (diff) | |
| download | mariadb-git-b399754780edce812991b36d108af48bf581f4c4.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
sql/set_var.cc:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/variables.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/ctype_utf8.test | 4 | ||||
| -rw-r--r-- | mysql-test/t/variables.test | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 0e1babf258b..39d83f8b815 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -382,6 +382,8 @@ select 1; 1 select @@session.key_buffer_size; ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable +set ft_boolean_syntax = @@init_connect; +ERROR HY000: Variable 'ft_boolean_syntax' is a GLOBAL variable and should be set with SET GLOBAL select @@global.max_user_connections,@@local.max_join_size; @@global.max_user_connections @@session.max_join_size 100 200 diff --git a/mysql-test/t/ctype_utf8.test b/mysql-test/t/ctype_utf8.test index 08a84df3ff7..964ac84fbbe 100644 --- a/mysql-test/t/ctype_utf8.test +++ b/mysql-test/t/ctype_utf8.test @@ -54,7 +54,7 @@ select * from t1; drop table t1; # -# Bug #2366 Wrong utf8 behaviour when data is trancated +# Bug #2366 Wrong utf8 behaviour when data is truncated # set names koi8r; create table t1 (s1 char(1) character set utf8); @@ -101,7 +101,7 @@ drop table t1; # # Bug 2699 -# UTF8 breaks primary keys for cols > 85 characters +# UTF8 breaks primary keys for cols > 333 characters # --error 1071 create table t1 (a text character set utf8, primary key(a(360))); diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 1ad171f94f6..c3f7c613005 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -270,6 +270,9 @@ select 1; --error 1238 select @@session.key_buffer_size; +--error 1229 +set ft_boolean_syntax = @@init_connect; + # # swap # |