Commit f932e51b authored by thek@kpdesk.mysql.com's avatar thek@kpdesk.mysql.com
Browse files

Merge kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1 

into  kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1-merge
parents 013fd236 e4d011c6

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_ddl.result

+1145 −3245

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/r/variables.result

+10 −0
Original line number Diff line number Diff line
@@ -1014,3 +1014,13 @@ Variable_name='table_lock_wait_timeout'; 
Variable_name	Value

table_definition_cache	#

table_lock_wait_timeout	#



# --

# -- Bug#34820: log_output can be set to illegal value.

# --

SET GLOBAL log_output = '';

ERROR 42000: Variable 'log_output' can't be set to the value of ''

SET GLOBAL log_output = 0;

ERROR 42000: Variable 'log_output' can't be set to the value of '0'



# -- End of Bug#34820.

mysql-test/t/disabled.def

+1 −1
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ user_limits : Bug#23921 random failure of user_limits.test 
concurrent_innodb        : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences

federated_transactions   : Bug#29523 Transactions do not work

lowercase_table3         : Bug#32667 lowercase_table3.test reports to error log

innodb_mysql         : Bug#32724: innodb_mysql.test fails randomly

ctype_create         : Bug#32965 main.ctype_create fails

status               : Bug#32966 main.status fails

ps_ddl               : Bug#12093 2007-12-14 pending WL#4165 / WL#4166

csv_alter_table      : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables

cast                 : Bug#35594 2008-03-27 main.cast fails on Windows2003-64