diff options
| author | unknown <gluh@eagle.(none)> | 2007-10-23 18:51:43 +0500 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-10-23 18:51:43 +0500 |
| commit | 3e459feb77946bea5ced868b29f94e64153a3ac0 (patch) | |
| tree | d36465f86e78c442a44942849b7280eab8d10bf8 /mysql-test/r/variables.result | |
| parent | 0b5e361bd8baf7c6f99bd3e5a13ca2c395a196f0 (diff) | |
| parent | 4eaaddecd883a56cb66c3756a82280666c76623c (diff) | |
| download | mariadb-git-3e459feb77946bea5ced868b29f94e64153a3ac0.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
client/mysqldump.c:
Auto merged
include/config-win.h:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/field.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/r/type_datetime.result:
manual merge
mysql-test/r/type_decimal.result:
manual merge
mysql-test/t/type_datetime.test:
manual merge
mysql-test/t/type_decimal.test:
manual merge
sql/item.cc:
manual merge
Diffstat (limited to 'mysql-test/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 9e52fbeac1a..457660d0de9 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -675,6 +675,9 @@ set @@query_prealloc_size = @test; select @@query_prealloc_size = @test; @@query_prealloc_size = @test 1 +set global sql_mode=repeat('a',80); +ERROR 42000: Variable 'sql_mode' can't be set to the value of 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +End of 4.1 tests create table t1 (a int); select a into @x from t1; Warnings: |