diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-07 23:18:12 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-07 23:18:12 +0200 |
| commit | e85894c182f4c131b961f87b0392beead3d43a19 (patch) | |
| tree | f1c68494d0547ce79f742d6afdbb72452885ec00 /mysql-test | |
| parent | 3c0487c4c31c516c745a020f2c1b2e836cb28d86 (diff) | |
| download | mariadb-git-e85894c182f4c131b961f87b0392beead3d43a19.tar.gz | |
Fix bug in ALTER TABLE on a TEMPORARY InnoDB table.
Docs/manual.texi:
Changelog
mysql-test/mysql-test-run.sh:
Change shutdown to 20 seconds for slow systems
mysql-test/r/innodb.result:
Testcase for found bug
mysql-test/t/innodb.test:
Testcase for found bug
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 4 | ||||
| -rw-r--r-- | mysql-test/r/innodb.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/innodb.test | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 9c2cda6108e..de76c6354f5 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -622,7 +622,7 @@ stop_slave () { if [ x$SLAVE_RUNNING = x1 ] then - $MYSQLADMIN --no-defaults --socket=$SLAVE_MYSOCK -u root -O shutdown_timeout=10 shutdown + $MYSQLADMIN --no-defaults --socket=$SLAVE_MYSOCK -u root -O shutdown_timeout=20 shutdown if [ $? != 0 ] && [ -f $SLAVE_MYPID ] then # try harder! $ECHO "slave not cooperating with mysqladmin, will try manual kill" @@ -644,7 +644,7 @@ stop_master () { if [ x$MASTER_RUNNING = x1 ] then - $MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK -u root -O shutdown_timeout=10 shutdown + $MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK -u root -O shutdown_timeout=20 shutdown if [ $? != 0 ] && [ -f $MASTER_MYPID ] then # try harder! $ECHO "master not cooperating with mysqladmin, will try manual kill" diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 9553f78f73c..fddfbfccd33 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -475,6 +475,10 @@ a 1 2 4 +a b +1 NULL +2 NULL +4 NULL id name value uid 1 one one value 101 3 three three value 103 diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index 5530e2b1f54..1f646828324 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -489,6 +489,8 @@ insert into t1 values (NULL),(NULL),(NULL); delete from t1 where a=3; insert into t1 values (NULL); select * from t1; +alter table t1 add b int; +select * from t1; drop table t1; #Slashdot bug @@ -511,4 +513,3 @@ set insert_id=6; replace into t1 (value,name,uid) values ('other value','two',102); select * from t1; drop table t1; - |