summaryrefslogtreecommitdiff
path: root/mysql-test/t/dyncol.test
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2013-08-12 17:33:08 +0400
committerAlexander Barkov <bar@mariadb.org>2013-08-12 17:33:08 +0400
commitb59738a598569ace75be5e63b7ed6ca69afe6ebc (patch)
treefe782f022937068aaab4d4b18171acc5d7533023 /mysql-test/t/dyncol.test
parentb718dc449bfc6aa5756a316d4db8853918765619 (diff)
parentf1b4718ec894664df221704bb70fed80bdc14070 (diff)
downloadmariadb-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/t/dyncol.test')
-rw-r--r--mysql-test/t/dyncol.test23
1 files changed, 23 insertions, 0 deletions
diff --git a/mysql-test/t/dyncol.test b/mysql-test/t/dyncol.test
index ca95dea0779..2bf5921c5db 100644
--- a/mysql-test/t/dyncol.test
+++ b/mysql-test/t/dyncol.test
@@ -604,6 +604,29 @@ drop view v1;
drop table t1;
--echo #
+--echo # MDEV-4811: Assertion `offset < 0x1f' fails in type_and_offset_store
+--echo # on COLUMN_ADD
+--echo #
+
+CREATE TABLE t1 (dyn TINYBLOB) ENGINE=MyISAM;
+INSERT INTO t1 SET dyn = COLUMN_CREATE( 40, REPEAT('a', 233), 4, REPEAT('b', 322) );
+--error ER_DYN_COL_WRONG_FORMAT
+SELECT COLUMN_ADD( dyn, 6, REPEAT('x',80), 4, REPEAT('y',215) AS INTEGER ) FROM t1;
+
+DROP table t1;
+
+--echo #
+--echo # MDEV-4812: Valgrind warnings (Invalid write) in
+--echo # dynamic_column_update_many on COLUMN_ADD
+--echo #
+CREATE TABLE t1 (dyncol TINYBLOB) ENGINE=MyISAM;
+
+INSERT INTO t1 SET dyncol = COLUMN_CREATE( 7, REPEAT('k',487), 209, REPEAT('x',464) );
+--error 0,ER_DYN_COL_WRONG_FORMAT
+SELECT COLUMN_ADD( dyncol, 7, '22:22:22', 8, REPEAT('x',270) AS CHAR ) FROM t1;
+DROP table t1;
+
+--echo #
--echo # end of 5.3 tests
--echo #