diff options
| author | unknown <acurtis@xiphis.org> | 2005-06-09 17:15:06 +0100 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2005-06-09 17:15:06 +0100 |
| commit | fec1c6ac67c1c1ed4cdbde97d066032f29650916 (patch) | |
| tree | d9346272a66df32b694fc91151af4459d92c8e47 /mysql-test/r/sql_mode.result | |
| parent | baae624cdbdec0cc1342f02a205d32b07f096011 (diff) | |
| parent | c995109b699a56e94bbc82754b17622f271ebb39 (diff) | |
| download | mariadb-git-fec1c6ac67c1c1ed4cdbde97d066032f29650916.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
myisam/mi_check.c:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/innodb_handler.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysql-test/t/create.test:
Auto merged
sql/set_var.cc:
Auto merged
mysql-test/r/sql_mode.result:
SCCS merged
mysql-test/t/sql_mode.test:
SCCS merged
sql/sql_acl.cc:
SCCS merged
sql/sql_handler.cc:
SCCS merged
sql/sql_table.cc:
SCCS merged
Diffstat (limited to 'mysql-test/r/sql_mode.result')
| -rw-r--r-- | mysql-test/r/sql_mode.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/sql_mode.result b/mysql-test/r/sql_mode.result index 09adc48259c..c5ba4d15a50 100644 --- a/mysql-test/r/sql_mode.result +++ b/mysql-test/r/sql_mode.result @@ -138,6 +138,8 @@ t1 CREATE TABLE `t1` ( `min_num` decimal(7,6) default '0.000001' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1 ; +set @@SQL_MODE=NULL; +ERROR 42000: Variable 'sql_mode' can't be set to the value of 'NULL' SET @OLD_SQL_MODE=@@SQL_MODE, @@SQL_MODE=''; show local variables like 'SQL_MODE'; Variable_name Value |