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

Merge from mysql-5.1.

Browse Source
This commit is contained in:
Alexander Nozdrin 2009-10-19 17:28:31 +04:00
commit b930b18ec3
5 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.in
View File

@ -2835,7 +2835,7 @@ server_scripts=
dnl This probably should be cleaned up more - for now the threaded dnl This probably should be cleaned up more - for now the threaded
dnl client is just using plain-old libs. dnl client is just using plain-old libs.
sql_client_dirs="strings regex mysys dbug libmysql" sql_client_dirs="strings mysys dbug extra regex libmysql"
AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no") AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no")
@ -2901,9 +2901,10 @@ AC_SUBST(mysql_plugin_defs)
# Now that sql_client_dirs and sql_server_dirs are stable, determine the union. # Now that sql_client_dirs and sql_server_dirs are stable, determine the union.
# Start with the (longer) server list, add each client item not yet present. # We support client-only builds by "--without-server", but not vice versa,
sql_union_dirs=" $sql_server_dirs " # so we start with the client list, then add each server item not yet present.
for DIR in $sql_client_dirs sql_union_dirs=" $sql_client_dirs "
for DIR in $sql_server_dirs
do do
if echo " $sql_union_dirs " | grep " $DIR " >/dev/null if echo " $sql_union_dirs " | grep " $DIR " >/dev/null
then then

1
mysql-test/collections/default.experimental
View File

@ -2,6 +2,7 @@
# in alphabetical order. This also helps with merge conflict resolution. # in alphabetical order. This also helps with merge conflict resolution.
binlog.binlog_tmp_table* # Bug#45578:2009-07-10 alik Test binlog_tmp_table fails ramdonly on PB2: Unknown table 't2' binlog.binlog_tmp_table* # Bug#45578:2009-07-10 alik Test binlog_tmp_table fails ramdonly on PB2: Unknown table 't2'
binlog.binlog_multi_engine # joro : NDB tests marked as experimental as agreed with bochklin
funcs_1.charset_collation_1 # depends on compile-time decisions funcs_1.charset_collation_1 # depends on compile-time decisions

7
mysql-test/r/myisam.result
View File

@ -2290,13 +2290,6 @@ Table Op Msg_type Msg_text
test.t1 repair error myisam_sort_buffer_size is too small test.t1 repair error myisam_sort_buffer_size is too small
test.t1 repair warning Number of rows changed from 0 to 7168 test.t1 repair warning Number of rows changed from 0 to 7168
test.t1 repair status OK test.t1 repair status OK
SET myisam_repair_threads=2;
REPAIR TABLE t1;
Table Op Msg_type Msg_text
test.t1 repair error myisam_sort_buffer_size is too small
test.t1 repair warning Number of rows changed from # to 7168
test.t1 repair status OK
SET myisam_repair_threads=@@global.myisam_repair_threads;
SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size; SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
DROP TABLE t1; DROP TABLE t1;
End of 5.1 tests End of 5.1 tests

11
mysql-test/t/myisam.test
View File

@ -1538,11 +1538,14 @@ INSERT INTO t1 SELECT a+2560,b FROM t1;
INSERT INTO t1 SELECT a+5120,b FROM t1; INSERT INTO t1 SELECT a+5120,b FROM t1;
SET myisam_sort_buffer_size=4; SET myisam_sort_buffer_size=4;
REPAIR TABLE t1; REPAIR TABLE t1;
SET myisam_repair_threads=2;
# !!! Disabled until additional fix for BUG#47073 is pushed.
#SET myisam_repair_threads=2;
# May report different values depending on threads activity. # May report different values depending on threads activity.
--replace_regex /changed from [0-9]+/changed from #/ #--replace_regex /changed from [0-9]+/changed from #/
REPAIR TABLE t1; #REPAIR TABLE t1;
SET myisam_repair_threads=@@global.myisam_repair_threads; #SET myisam_repair_threads=@@global.myisam_repair_threads;
SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size; SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
DROP TABLE t1; DROP TABLE t1;

4
mysys/mf_keycache.c
View File

@ -1730,6 +1730,7 @@ restart:
- block assigned but not yet read from file (invalid data). - block assigned but not yet read from file (invalid data).
*/ */
#ifdef THREAD
if (keycache->in_resize) if (keycache->in_resize)
{ {
/* This is a request during a resize operation */ /* This is a request during a resize operation */
@ -1971,6 +1972,9 @@ restart:
} }
DBUG_RETURN(0); DBUG_RETURN(0);
} }
#else /* THREAD */
DBUG_ASSERT(!keycache->in_resize);
#endif
if (page_status == PAGE_READ && if (page_status == PAGE_READ &&
(block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH | (block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH |