mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/svoj/devel/mysql/BUG29957/mysql-5.0-engines

Browse source 
into  mysql.com:/home/svoj/devel/mysql/BUG29957/mysql-5.1-engines
This commit is contained in:
svoj@june.mysql.com 2007-07-27 14:44:31 +05:00
commit 21b707e43d
3 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mysql-test/r/alter_table.result
View file

@ -1172,3 +1172,15 @@ SELECT * FROM t1;
f1 f2 f3 f1 f2 f3
1 2 NULL 1 2 NULL
DROP TABLE t1; DROP TABLE t1;
create table t1 (c char(10) default "Two");
lock table t1 write;
insert into t1 values ();
alter table t1 modify c char(10) default "Three";
unlock tables;
select * from t1;
c
Two
check table t1;
Table Op Msg_type Msg_text
test.t1 check status OK
drop table t1;

12
mysql-test/t/alter_table.test
View file

@ -902,3 +902,15 @@ SELECT * FROM t1;
ALTER TABLE t1 MODIFY COLUMN f3 INT AFTER f2; ALTER TABLE t1 MODIFY COLUMN f3 INT AFTER f2;
SELECT * FROM t1; SELECT * FROM t1;
DROP TABLE t1; DROP TABLE t1;
#
# BUG#29957 - alter_table.test fails
#
create table t1 (c char(10) default "Two");
lock table t1 write;
insert into t1 values ();
alter table t1 modify c char(10) default "Three";
unlock tables;
select * from t1;
check table t1;
drop table t1;

2
storage/myisam/mi_extra.c
View file

@ -258,7 +258,7 @@ int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg)
case HA_EXTRA_PREPARE_FOR_DELETE: case HA_EXTRA_PREPARE_FOR_DELETE:
pthread_mutex_lock(&THR_LOCK_myisam); pthread_mutex_lock(&THR_LOCK_myisam);
share->last_version= 0L; /* Impossible version */ share->last_version= 0L; /* Impossible version */
#ifdef __WIN__ #ifdef __WIN__REMOVE_OBSOLETE_WORKAROUND
/* Close the isam and data files as Win32 can't drop an open table */ /* Close the isam and data files as Win32 can't drop an open table */
pthread_mutex_lock(&share->intern_lock); pthread_mutex_lock(&share->intern_lock);
if (flush_key_blocks(share->key_cache, share->kfile, if (flush_key_blocks(share->key_cache, share->kfile,