Commit 8cba72fe authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

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

parents 490a40d6 4b1836ee

Docs/manual.texi

+3 −0
Original line number Diff line number Diff line
@@ -49343,6 +49343,9 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}. 














@itemize @bullet















@item













Fixed that @code{ALTER TABLE table_name RENAME new_table_name} is as fast













as @code{RENAME TABLE}.













@item















Fixed bug in @code{GROUP BY} with two or more fields, where at least one















field can contain @code{NULL} values.















@item

























client/mysqltest.c



+5
−1






























Original line number
Diff line number
Diff line








@@ -42,7 +42,7 @@





























**********************************************************************/





























#define MTEST_VERSION "1.23"













#define MTEST_VERSION "1.24"































#include <my_global.h>















#include <mysql_embed.h>










@@ -1446,6 +1446,8 @@ int do_connect(struct st_query* q)













    die("Failed on mysql_init()");















  if (opt_compress)















    mysql_options(&next_con->mysql,MYSQL_OPT_COMPRESS,NullS);













  mysql_options(&next_con->mysql, MYSQL_OPT_LOCAL_INFILE, 0);





























  if (con_sock && !free_con_sock && *con_sock && *con_sock != FN_LIBCHAR)















    con_sock=fn_format(buff, con_sock, TMPDIR, "",0);















  if (!con_db[0])










@@ -2355,6 +2357,8 @@ int main(int argc, char** argv)













    die("Failed in mysql_init()");















  if (opt_compress)















    mysql_options(&cur_con->mysql,MYSQL_OPT_COMPRESS,NullS);













  mysql_options(&cur_con->mysql, MYSQL_OPT_LOCAL_INFILE, 0);





























  cur_con->name = my_strdup("default", MYF(MY_WME));















  if (!cur_con->name)















    die("Out of memory");

































mysql-test/r/alter_table.result



+8
−0






























Original line number
Diff line number
Diff line








@@ -114,3 +114,11 @@ i













3















4















drop table t1;













create table t1 (i int unsigned not null auto_increment primary key);













alter table t1 rename t2;













alter table t2 rename t1, add c char(10) comment "no comment";













show columns from t1;













Field	Type	Null	Key	Default	Extra













i	int(10) unsigned		PRI	NULL	auto_increment













c	char(10)	YES		NULL	













drop table t1;
























mysql-test/r/func_math.result



+2
−0






























Original line number
Diff line number
Diff line








@@ -4,8 +4,10 @@ floor(5.5)	floor(-5.5)













select ceiling(5.5),ceiling(-5.5);















ceiling(5.5)	ceiling(-5.5)















6	-5













select truncate(52.64,1),truncate(52.64,2),truncate(52.64,-1),truncate(52.64,-2), truncate(-52.64,1),truncate(-52.64,-1);















truncate(52.64,1)	truncate(52.64,2)	truncate(52.64,-1)	truncate(52.64,-2)	truncate(-52.64,1)	truncate(-52.64,-1)















52.6	52.64	50	0	-52.6	-50













select round(5.5),round(-5.5);















round(5.5)	round(-5.5)















6	-6















select round(5.64,1),round(5.64,2),round(5.64,-1),round(5.64,-2);

































mysql-test/t/alter_table.test



+10
−0






























Original line number
Diff line number
Diff line








@@ -105,3 +105,13 @@ insert into t1 values (null),(null),(null),(null);













alter table t1 drop i,add i int unsigned not null auto_increment, drop primary key, add primary key (i);















select * from t1;















drop table t1;



























#













# Alter table and rename













#



























create table t1 (i int unsigned not null auto_increment primary key);













alter table t1 rename t2;













alter table t2 rename t1, add c char(10) comment "no comment";













show columns from t1;













drop table t1;