diff options
| author | Alexander Barkov <bar@mariadb.org> | 2013-08-12 17:33:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2013-08-12 17:33:08 +0400 |
| commit | b59738a598569ace75be5e63b7ed6ca69afe6ebc (patch) | |
| tree | fe782f022937068aaab4d4b18171acc5d7533023 /mysql-test/r/dyncol.result | |
| parent | b718dc449bfc6aa5756a316d4db8853918765619 (diff) | |
| parent | f1b4718ec894664df221704bb70fed80bdc14070 (diff) | |
| download | mariadb-git-b59738a598569ace75be5e63b7ed6ca69afe6ebc.tar.gz | |
Merge from 5.3
modified:
mysql-test/r/dyncol.result
mysql-test/r/type_time.result
mysql-test/t/dyncol.test
mysql-test/t/type_time.test
mysys/ma_dyncol.c
sql/item.cc
sql/item_func.cc
pending merges:
Alexander Barkov 2013-08-12 MDEV-4652 Wrong result for CONCAT(GREATEST(T...
sanja@montyprogr... 2013-08-01 MDEV-4811 Assertion `offset < 0x1f' f...
Diffstat (limited to 'mysql-test/r/dyncol.result')
| -rw-r--r-- | mysql-test/r/dyncol.result | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/r/dyncol.result b/mysql-test/r/dyncol.result index 2411f1070d9..dc2dcf479d7 100644 --- a/mysql-test/r/dyncol.result +++ b/mysql-test/r/dyncol.result @@ -1404,5 +1404,26 @@ v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI drop view v1; drop table t1; # +# MDEV-4811: Assertion `offset < 0x1f' fails in type_and_offset_store +# on COLUMN_ADD +# +CREATE TABLE t1 (dyn TINYBLOB) ENGINE=MyISAM; +INSERT INTO t1 SET dyn = COLUMN_CREATE( 40, REPEAT('a', 233), 4, REPEAT('b', 322) ); +Warnings: +Warning 1265 Data truncated for column 'dyn' at row 1 +SELECT COLUMN_ADD( dyn, 6, REPEAT('x',80), 4, REPEAT('y',215) AS INTEGER ) FROM t1; +ERROR HY000: Encountered illegal format of dynamic column string +DROP table t1; +# +# MDEV-4812: Valgrind warnings (Invalid write) in +# dynamic_column_update_many on COLUMN_ADD +# +CREATE TABLE t1 (dyncol TINYBLOB) ENGINE=MyISAM; +INSERT INTO t1 SET dyncol = COLUMN_CREATE( 7, REPEAT('k',487), 209, REPEAT('x',464) ); +Warnings: +Warning 1265 Data truncated for column 'dyncol' at row 1 +SELECT COLUMN_ADD( dyncol, 7, '22:22:22', 8, REPEAT('x',270) AS CHAR ) FROM t1; +DROP table t1; +# # end of 5.3 tests # |