database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge fix for BUG48438 to mysql-5.1-bugteam.

Browse Source
This commit is contained in:
Sergey Vojtovich
2010-02-12 16:47:43 +04:00
parent 1d2a8e7175 e766c177bb
commit d48d71b804
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/r/myisam.result
View File

@ -1868,6 +1868,19 @@ CHECKSUM TABLE t1 EXTENDED;
Table Checksum Table Checksum
test.t1 467455460 test.t1 467455460
DROP TABLE t1; DROP TABLE t1;
#
# BUG#48438 - crash with error in unioned query against merge table and view...
#
SET GLOBAL table_open_cache=3;
CREATE TABLE t1(a INT);
SELECT 1 FROM t1 AS a1, t1 AS a2, t1 AS a3, t1 AS a4 FOR UPDATE;
1
SELECT TABLE_ROWS, DATA_LENGTH FROM INFORMATION_SCHEMA.TABLES
WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
TABLE_ROWS DATA_LENGTH
0 0
DROP TABLE t1;
SET GLOBAL table_open_cache=DEFAULT;
End of 5.0 tests End of 5.0 tests
create table t1 (a int not null, key `a` (a) key_block_size=1024); create table t1 (a int not null, key `a` (a) key_block_size=1024);
show create table t1; show create table t1;

11
mysql-test/t/myisam.test
View File

@ -1198,6 +1198,17 @@ CHECKSUM TABLE t1 EXTENDED;
DROP TABLE t1; DROP TABLE t1;
--echo #
--echo # BUG#48438 - crash with error in unioned query against merge table and view...
--echo #
SET GLOBAL table_open_cache=3;
CREATE TABLE t1(a INT);
SELECT 1 FROM t1 AS a1, t1 AS a2, t1 AS a3, t1 AS a4 FOR UPDATE;
SELECT TABLE_ROWS, DATA_LENGTH FROM INFORMATION_SCHEMA.TABLES
WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
DROP TABLE t1;
SET GLOBAL table_open_cache=DEFAULT;
--echo End of 5.0 tests --echo End of 5.0 tests

2
storage/myisam/mi_locking.c
View File

@ -321,8 +321,8 @@ void mi_update_status(void* param)
(long) info->s->state.state.data_file_length)); (long) info->s->state.state.data_file_length));
#endif #endif
info->s->state.state= *info->state; info->s->state.state= *info->state;
info->state= &info->s->state.state;
} }
info->state= &info->s->state.state;
info->append_insert_at_end= 0; info->append_insert_at_end= 0;
/* /*