diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-11-16 21:49:51 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-11-16 21:49:51 +0100 |
| commit | 69b8b9d63edbdb0c4bd669817a88ec1a8afbef44 (patch) | |
| tree | f1b33a7aed53016189b17cd3f50243b3c8a022de /mysql-test/r/insert_select.result | |
| parent | 6cf6c18f9da44597821eb1a20a9d35cd21ff018e (diff) | |
| parent | 8864a933c99010c0f95cd18c3d113caf31074469 (diff) | |
| download | mariadb-git-69b8b9d63edbdb0c4bd669817a88ec1a8afbef44.tar.gz | |
Merge with MySQL 5.1, with following additions:
- Moved some code from innodb_plugin to xtradb, to ensure that all tests runs
- Did changes in pbxt and maria storage engines becasue of changes in thd->query
- Reverted wrong code in sql_table.cc for how ROW_FORMAT is used.
This is a re-commit of Monty's merge to eliminate an extra commit from
MySQL-5.1.42 that was accidentally included in the merge.
This is a merge of the MySQL 5.1.41 clone-off (clone-5.1.41-build). In
case there are any extra changes done before final MySQL 5.1.41
release, these will need to be merged later before MariaDB 5.1.41
release.
Diffstat (limited to 'mysql-test/r/insert_select.result')
| -rw-r--r-- | mysql-test/r/insert_select.result | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result index 94c58497101..cf3c0b0731e 100644 --- a/mysql-test/r/insert_select.result +++ b/mysql-test/r/insert_select.result @@ -833,3 +833,17 @@ Table Op Msg_type Msg_text test.t2 check status OK drop table t1,t2; End of 5.0 tests +################################################################## +# +# Bug #46075: Assertion failed: 0, file .\protocol.cc, line 416 +# +CREATE TABLE t1(a INT); +SET max_heap_table_size = 16384; +SET @old_myisam_data_pointer_size = @@myisam_data_pointer_size; +SET GLOBAL myisam_data_pointer_size = 2; +INSERT INTO t1 VALUES (1), (2), (3), (4), (5); +call mtr.add_suppression("mysqld: The table '.*#sql.*' is full"); +INSERT IGNORE INTO t1 SELECT t1.a FROM t1,t1 t2,t1 t3,t1 t4,t1 t5,t1 t6,t1 t7; +SET GLOBAL myisam_data_pointer_size = @old_myisam_data_pointer_size; +DROP TABLE t1; +End of 5.1 tests |