diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-03-28 12:52:47 +0400 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-03-28 12:52:47 +0400 |
| commit | 4ab6313b81e12fd6f6e0edf6f04403eff53ea913 (patch) | |
| tree | 2bb3251262891d9d8923ebadb0d566ee47cc322f /mysql-test/r | |
| parent | b1b17093c890d622e38db4667eb3bd24127251e5 (diff) | |
| parent | a88faf2a4af5f60722647a8e01de6aac20305bb7 (diff) | |
| download | mariadb-git-4ab6313b81e12fd6f6e0edf6f04403eff53ea913.tar.gz | |
5.1 -> 5.5 merge
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/func_math.result | 7 | ||||
| -rw-r--r-- | mysql-test/r/variables.result | 16 |
2 files changed, 23 insertions, 0 deletions
diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result index 57ec0cc0aca..525ee0dc506 100644 --- a/mysql-test/r/func_math.result +++ b/mysql-test/r/func_math.result @@ -514,6 +514,13 @@ t1 CREATE TABLE `t1` ( `C` varchar(23) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t1; +# +# Bug#11764994 57900: CREATE TABLE .. SELECT ASSERTS SCALE >= 0 && PRECISION > 0 && SCALE <= PR +# +CREATE TABLE t1 SELECT CEIL(LINESTRINGFROMWKB(1) DIV NULL); +DROP TABLE t1; +CREATE TABLE t1 SELECT FLOOR(LINESTRINGFROMWKB(1) DIV NULL); +DROP TABLE t1; End of 5.1 tests # # Bug #8433: Overflow must be an error diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 2b242308a6d..e550bf7d8e9 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -1546,6 +1546,22 @@ Warning 1292 Truncated incorrect key_cache_block_size value: '0' select @@max_long_data_size; @@max_long_data_size 1048576 +# +# Bug#11766424 59527: DECIMAL_BIN_SIZE: ASSERTION `SCALE >= 0 && PRECISION > 0 && SCALE <= PRE +# +CREATE TABLE t1(f1 DECIMAL(1,1) UNSIGNED); +INSERT INTO t1 VALUES (0.2),(0.1); +SELECT 1 FROM t1 GROUP BY @a:= (SELECT ROUND(f1) FROM t1 WHERE @a=f1); +1 +1 +DROP TABLE t1; +CREATE TABLE t1 AS SELECT @a:= CAST(1 AS UNSIGNED) AS a; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(1) unsigned NOT NULL DEFAULT '0' +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +DROP TABLE t1; SET @@global.max_binlog_cache_size=DEFAULT; SET @@global.max_join_size=DEFAULT; SET @@global.key_buffer_size=@kbs; |