Commit db705749 authored by kostja@bodhi.(none)'s avatar kostja@bodhi.(none)
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 

into  bodhi.(none):/opt/local/work/mysql-5.1-27430
parents 013fd236 78e4f401

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ typedef unsigned short ushort; 


#define CMP_NUM(a,b)    (((a) < (b)) ? -1 : ((a) == (b)) ? 0 : 1)

#define sgn(a)		(((a) < 0) ? -1 : ((a) > 0) ? 1 : 0)

#define swap_variables(t, a, b) { register t dummy; dummy= a; a= b; b= dummy; }

#define swap_variables(t, a, b) { t dummy; dummy= a; a= b; b= dummy; }

#define test(a)		((a) ? 1 : 0)

#define set_if_bigger(a,b)  do { if ((a) < (b)) (a)=(b); } while(0)

#define set_if_smaller(a,b) do { if ((a) > (b)) (a)=(b); } while(0)

mysql-test/include/mix1.inc

+1 −0
Original line number Diff line number Diff line
@@ -1309,6 +1309,7 @@ SELECT * FROM t1; 


--echo # Switch to connection con2

connection con2;

--reap

SELECT * FROM t1;



--echo # Switch to connection con1

mysql-test/r/grant.result

+6 −0
Original line number Diff line number Diff line
@@ -1218,6 +1218,12 @@ DROP USER mysqltest_1@localhost; 
DROP DATABASE db27878;

use test;

DROP TABLE t1;

#

#  Bug#33275 Server crash when creating temporary table mysql.user

#

CREATE TEMPORARY TABLE mysql.user (id INT);

FLUSH PRIVILEGES;

DROP TABLE mysql.user;

drop table if exists test;

Warnings:

Note	1051	Unknown table 'test'

mysql-test/r/log_state.result

+21 −0
Original line number Diff line number Diff line
@@ -249,4 +249,25 @@ set global slow_query_log_file= NULL; 
ERROR 42000: Variable 'slow_query_log_file' can't be set to the value of 'NULL'

set global general_log_file= @old_general_log_file;

set global slow_query_log_file= @old_slow_query_log_file;



# --

# -- Bug#32748: Inconsistent handling of assignments to

# -- general_log_file/slow_query_log_file.

# --



SET @general_log_file_saved = @@global.general_log_file;

SET @slow_query_log_file_saved = @@global.slow_query_log_file;



SET GLOBAL general_log_file = 'bug32748.query.log';

SET GLOBAL slow_query_log_file = 'bug32748.slow.log';



SHOW VARIABLES LIKE '%log_file';

Variable_name	Value

general_log_file	bug32748.query.log

slow_query_log_file	bug32748.slow.log



SET GLOBAL general_log_file = @general_log_file_saved;

SET GLOBAL slow_query_log_file = @slow_query_log_file_saved;



# -- End of Bug#32748.

End of 5.1 tests

mysql-test/r/ps_1general.result

+10 −9
Original line number Diff line number Diff line
@@ -143,32 +143,32 @@ b char(30) 
);

insert into t5( a, b, c) values( 9, 'recreated table', 9);

execute stmt2 ;

a	b	c

9	recreated table	9

a	c	b

9	9	recreated table

drop table t5 ;

create table t5

(

a int primary key,

b char(30),

c int,

d timestamp default current_timestamp

d timestamp default '2008-02-23 09:23:45'

);

insert into t5( a, b, c) values( 9, 'recreated table', 9);

execute stmt2 ;

a	b	c

9	recreated table	9

a	b	c	d

9	recreated table	9	2008-02-23 09:23:45

drop table t5 ;

create table t5

(

a int primary key,

d timestamp default current_timestamp,

d timestamp default '2008-02-23 09:23:45',

b char(30),

c int

);

insert into t5( a, b, c) values( 9, 'recreated table', 9);

execute stmt2 ;

a	b	c

9	recreated table	9

a	d	b	c

9	2008-02-23 09:23:45	recreated table	9

drop table t5 ;

create table t5

(
@@ -189,7 +189,8 @@ f3 int 
);

insert into t5( f1, f2, f3) values( 9, 'recreated table', 9);

execute stmt2 ;

ERROR 42S22: Unknown column 'test.t5.a' in 'field list'

f1	f2	f3

9	recreated table	9

drop table t5 ;

prepare stmt1 from ' select * from t1 where a <= 2 ' ;

execute stmt1 ;