1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge with 5.2

Browse Source
This commit is contained in:
Michael Widenius 2011-09-15 17:25:37 +03:00
commit 574e51e5fd
12 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -18,7 +18,7 @@ dnl When merging new MySQL releases, update the version number to match the
dnl MySQL version number.
dnl
dnl Note: the following line must be parseable by win/configure.js:GetVersion()
AC_INIT([MariaDB Server], [5.3.1-MariaDB-beta], [], [mysql])
AC_INIT([MariaDB Server], [5.3.2-MariaDB-beta], [], [mysql])
AC_CONFIG_SRCDIR([sql/mysqld.cc])
AC_CANONICAL_SYSTEM

27
mysql-test/extra/rpl_tests/rpl_row_func003.test
View File

@ -47,17 +47,9 @@ delimiter ;|
--disable_warnings
INSERT INTO test.t1 VALUES (null,test.f1()),(null,test.f1()),(null,test.f1());
sleep 6;
INSERT INTO test.t1 VALUES (null,test.f1()),(null,test.f1()),(null,test.f1());
sleep 6;
--enable_warnings
#Select in this test are used for debugging
#select * from test.t1;
#connection slave;
#select * from test.t1;
connection master;
SET AUTOCOMMIT=0;
START TRANSACTION;
--disable_warnings
@ -65,18 +57,14 @@ INSERT INTO test.t1 VALUES (null,test.f1());
--enable_warnings
ROLLBACK;
SET AUTOCOMMIT=1;
#select * from test.t1;
#sleep 6;
#connection slave;
#select * from test.t1;
# Sync master and slave for all engines except NDB
if (`SELECT UPPER(LEFT('$engine_type', 3)) != 'NDB'`) {
sync_slave_with_master;
connection master;
}
#connection master;
#used for debugging
#show binlog events;
# time to dump the databases and so we can see if they match
# Time to dump the databases and so we can see if they match
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/func003_master.sql
--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/func003_slave.sql
@ -93,5 +81,8 @@ DROP TABLE test.t1;
diff_files $MYSQLTEST_VARDIR/tmp/func003_master.sql $MYSQLTEST_VARDIR/tmp/func003_slave.sql;
# Clean up
remove_file $MYSQLTEST_VARDIR/tmp/func003_master.sql;
remove_file $MYSQLTEST_VARDIR/tmp/func003_slave.sql;
# End of 5.0 test case

2
mysql-test/mysql-test-run.pl
View File

@ -4459,6 +4459,8 @@ sub extract_warning_lines ($$) {
qr|mysqld: Table '\./mtr/test_suppressions' is marked as crashed and should be repaired|,
qr|Can't open shared library.*ha_archive|,
qr|InnoDB: Error: table 'test/bug39438'|,
qr|Access denied for user|,
qr|Aborted connection|,
qr|table.*is full|,
);

2
mysql-test/r/variables.result
View File

@ -27,6 +27,7 @@ set @my_thread_cache_size =@@global.thread_cache_size;
set @my_max_allowed_packet =@@global.max_allowed_packet;
set @my_delay_key_write =@@global.delay_key_write;
set @my_join_buffer_size =@@global.join_buffer_size;
set @my_log_warnings =@@global.log_warnings;
set @`test`=1;
select @test, @`test`, @TEST, @`TEST`, @"teSt";
@test @`test` @TEST @`TEST` @"teSt"
@ -1065,6 +1066,7 @@ set global thread_cache_size =@my_thread_cache_size;
set global max_allowed_packet = default;
set global delay_key_write =@my_delay_key_write;
set global join_buffer_size =@my_join_buffer_size;
set global log_warnings =@my_log_warnings;
show global variables where Variable_name='table_definition_cache' or
Variable_name='table_lock_wait_timeout';
Variable_name Value

2
mysql-test/suite/pbxt/r/limit.result
View File

@ -23,7 +23,7 @@ a b
2 2
3 2
4 4
delete from t1 where b=2 limit 1;
delete from t1 where b=2 order by a limit 1;
select * from t1 order by a;
a b
0 0

2
mysql-test/suite/pbxt/t/limit.test
View File

@ -15,7 +15,7 @@ update t1 set b=2 where b=1 limit 2;
select * from t1 order by a; # PBXT: required for consistent result
update t1 set b=4 where b=1;
select * from t1 order by a; # PBXT: required for consistent result
delete from t1 where b=2 limit 1;
delete from t1 where b=2 order by a limit 1;
select * from t1 order by a; # PBXT: required for consistent result
delete from t1 limit 1;
select * from t1 order by a; # PBXT: required for consistent result

2
mysql-test/suite/rpl/r/rpl_idempotency.result
View File

@ -1,6 +1,6 @@
include/master-slave.inc
[connection master]
call mtr.add_suppression("Can.t find record in .t[12].* Error_code: 1032");
call mtr.add_suppression("Can.t find record in .t[12].*");
call mtr.add_suppression("Slave: Cannot delete or update a parent row: a foreign key constraint fails .* Error_code: 1451");
call mtr.add_suppression("Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452");
call mtr.add_suppression("Slave SQL.*Could not execute Write_rows event on table test.* Duplicate entry .1. for key .PRIMARY.* Error_code: 1062");

2
mysql-test/suite/rpl/t/rpl_idempotency.test
View File

@ -9,7 +9,7 @@ source include/have_innodb.inc;
# Add suppression for expected warning(s) in slaves error log
call mtr.add_suppression("Can.t find record in .t[12].* Error_code: 1032");
call mtr.add_suppression("Can.t find record in .t[12].*");
call mtr.add_suppression("Slave: Cannot delete or update a parent row: a foreign key constraint fails .* Error_code: 1451");
call mtr.add_suppression("Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452");
call mtr.add_suppression("Slave SQL.*Could not execute Write_rows event on table test.* Duplicate entry .1. for key .PRIMARY.* Error_code: 1062");

2
mysql-test/t/variables.test
View File

@ -36,6 +36,7 @@ set @my_thread_cache_size =@@global.thread_cache_size;
set @my_max_allowed_packet =@@global.max_allowed_packet;
set @my_delay_key_write =@@global.delay_key_write;
set @my_join_buffer_size =@@global.join_buffer_size;
set @my_log_warnings =@@global.log_warnings;
# case insensitivity tests (new in 5.0)
set @`test`=1;
select @test, @`test`, @TEST, @`TEST`, @"teSt";
@ -844,6 +845,7 @@ set global thread_cache_size =@my_thread_cache_size;
set global max_allowed_packet = default;
set global delay_key_write =@my_delay_key_write;
set global join_buffer_size =@my_join_buffer_size;
set global log_warnings =@my_log_warnings;
#
# Bug#28580 Repeatation of status variables

6
sql/mysqld.cc
View File

@ -1142,7 +1142,7 @@ static void close_connections(void)
tmp->thread_id,
(tmp->main_security_ctx.user ?
tmp->main_security_ctx.user : ""));
close_connection(tmp,0,0);
close_connection(tmp,ER_SERVER_SHUTDOWN,0);
}
#endif
DBUG_PRINT("quit",("Unlocking LOCK_thread_count"));
@ -5283,7 +5283,7 @@ void create_thread_to_handle_connection(THD *thd)
ER(ER_CANT_CREATE_THREAD), error);
net_send_error(thd, ER_CANT_CREATE_THREAD, error_message_buff);
(void) pthread_mutex_lock(&LOCK_thread_count);
close_connection(thd,0,0);
close_connection(thd,ER_OUT_OF_RESOURCES,0);
delete thd;
(void) pthread_mutex_unlock(&LOCK_thread_count);
return;
@ -6592,7 +6592,7 @@ each time the SQL thread starts.",
"log and this option just turns on --log-bin instead.",
&opt_update_logname, &opt_update_logname, 0, GET_STR,
OPT_ARG, 0, 0, 0, 0, 0, 0},
{"log-warnings", 'W', "Log some not critical warnings to the general log file. Value can be between 0-6; The higher value, the more warnings",
{"log-warnings", 'W', "Log some not critical warnings to the general log file. Value can be between 0-11; The higher value, the more warnings",
&global_system_variables.log_warnings,
&max_system_variables.log_warnings, 0, GET_ULONG, OPT_ARG, 1, 0, 0,
0, 0, 0},

2
storage/maria/ha_maria.cc
View File

@ -3536,7 +3536,7 @@ my_bool ha_maria::register_query_cache_table(THD *thd, char *table_name,
*engine_data= 0;
if (file->s->now_transactional && file->s->have_versioning)
return (file->trn->trid >= file->s->state.last_change_trn);
DBUG_RETURN(file->trn->trid >= file->s->state.last_change_trn);
/*
If a concurrent INSERT has happened just before the currently processed

1
storage/myisam/mi_test2.c
View File

@ -836,6 +836,7 @@ end:
puts("Locking used");
if (use_blob)
puts("blobs used");
bzero(&stats, sizeof(stats));
get_key_cache_statistics(dflt_key_cache, 0, &stats);
printf("key cache status: \n\
blocks used:%10lu\n\