Commit 0798c70c authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql

parents 28696843 1bc03e8b

Docs/manual.texi

+2 −0
Original line number Diff line number Diff line
@@ -46852,6 +46852,8 @@ Fixed bug with BDB tables and keys on @code{BLOB}'s. 
Fixed bug in @code{MERGE} tables on OS with 32 bit file pointers.

@item

Fixed bug in @code{TIME_TO_SEC()} when using negative values.

@item

Fixed core dump bug in @code{ALTER TABLE} on a @code{TEMPORARY} InnoDB table.

@end itemize















@node News-3.23.44, News-3.23.43, News-3.23.45, News-3.23.x

























mysql-test/mysql-test-run.sh



+2
−2






























Original line number
Diff line number
Diff line








@@ -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"

































mysql-test/r/innodb.result



+4
−0






























Original line number
Diff line number
Diff line








@@ -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

































mysql-test/t/innodb.test



+2
−1






























Original line number
Diff line number
Diff line








@@ -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;




































sql/sql_table.cc



+6
−0






























Original line number
Diff line number
Diff line








@@ -1509,6 +1509,12 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,













      my_free((gptr) new_table,MYF(0));















      goto err;















    }













    /* Close lock if this is a transactional table */













    if (thd->lock)













    {













      mysql_unlock_tables(thd, thd->lock);













      thd->lock=0;













    }















    /* Remove link to old table and rename the new one */















    close_temporary_table(thd,table->table_cache_key,table_name);















    if (rename_temporary_table(thd, new_table, new_db, new_name))