Commit 2c0ce2a8 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 7ec38d1f 86396459

Makefile.am

+6 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ tags: 
  test-pl test-force-pl test-full-pl test-force-full-pl test-force-pl-mem \

  test-unit test-ps test-nr test-pr test-ns test-binlog-statement \

  test-ext-funcs test-ext-rpl test-ext-partitions test-ext-jp \

  test-ext-stress test-ext test-embedded \

  test-ext-stress test-ext test-embedded test-reprepare \

  test-fast test-fast-cursor test-fast-view test-fast-prepare \

  test-full-qa
@@ -111,6 +111,11 @@ test-embedded: 
	  echo "no program found for 'embedded' tests - skipped testing" ; \

	fi



test-reprepare:

	cd mysql-test ; \

	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol \

		--mysqld=--debug=+d,reprepare_each_statement



test:	test-unit test-ns test-pr



test-full:	test test-nr test-ps

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)

include/my_sys.h

+3 −0
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ extern int NEAR my_errno; /* Last error in mysys */ 
#define ME_COLOUR1	((1 << ME_HIGHBYTE))	/* Possibly error-colours */

#define ME_COLOUR2	((2 << ME_HIGHBYTE))

#define ME_COLOUR3	((3 << ME_HIGHBYTE))

#define ME_FATALERROR   1024    /* Fatal statement error */

#define ME_NO_WARNING_FOR_ERROR 2048 /* Don't push a warning for error */

#define ME_NO_SP_HANDLER 4096 /* Don't call stored routine error handlers */



	/* Bits in last argument to fn_format */

#define MY_REPLACE_DIR		1	/* replace dir in name with 'dir' */

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