diff options
| author | unknown <guilhem@mysql.com> | 2006-02-18 19:07:32 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2006-02-18 19:07:32 +0100 |
| commit | 16bc37632ce546704116a1e09388a709c7b13fca (patch) | |
| tree | 752fc742b26a858079ca0b5b18f032c03f5a605b /mysql-test/r/sql_mode.result | |
| parent | 309f51cd28625316f2eb2ad34ba0f95b0d986264 (diff) | |
| parent | 8dc567dbed7ab9c6489d0b2f2c72d723c87c68e5 (diff) | |
| download | mariadb-git-16bc37632ce546704116a1e09388a709c7b13fca.tar.gz | |
Merge mysql.com:/home/mysql_src/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.1-new; will fix manually sp_head.cc and mysqld.cc later soon.
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
Auto merged
mysql-test/r/rpl_sp.result:
Auto merged
mysql-test/r/sql_mode.result:
Auto merged
mysql-test/t/rpl_sp-slave.opt:
Auto merged
mysql-test/t/rpl_sp.test:
Auto merged
mysql-test/t/sql_mode.test:
Auto merged
sql/set_var.cc:
Auto merged
sql/log.cc:
auto merged
sql/mysqld.cc:
will fix manually
sql/sp_head.cc:
will fix manually
Diffstat (limited to 'mysql-test/r/sql_mode.result')
| -rw-r--r-- | mysql-test/r/sql_mode.result | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/r/sql_mode.result b/mysql-test/r/sql_mode.result index 8e8844fa6dc..f9f8fd8446c 100644 --- a/mysql-test/r/sql_mode.result +++ b/mysql-test/r/sql_mode.result @@ -460,4 +460,20 @@ v1 CREATE ALGORITHM=UNDEFINED DEFINER="root"@"localhost" SQL SECURITY DEFINER VI create view v2 as select a from t2 where a in (select a from v1); drop view v2, v1; drop table t1, t2; +select @@sql_mode; +@@sql_mode +ANSI_QUOTES +set sql_mode=2097152; +select @@sql_mode; +@@sql_mode +STRICT_TRANS_TABLES +set sql_mode=16384+(65536*4); +select @@sql_mode; +@@sql_mode +REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,NO_TABLE_OPTIONS,ANSI +set sql_mode=2147483648; +ERROR 42000: Variable 'sql_mode' can't be set to the value of '2147483648' +select @@sql_mode; +@@sql_mode +REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,NO_TABLE_OPTIONS,ANSI SET @@SQL_MODE=@OLD_SQL_MODE; |