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

merge with 5.1-release

Browse Source
This commit is contained in:
Michael Widenius 2010-12-05 15:10:12 +02:00
commit 6061a11d36
5 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/pbxt/r/select.result
View File

@ -3447,9 +3447,7 @@ insert into t2 select A.a, B.a, C.a, C.a from t1 A, t1 B, t1 C;
analyze table t2; analyze table t2;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t2 analyze status OK test.t2 analyze status OK
select 'In next EXPLAIN, B.rows must be exactly 10:' Z; In next EXPLAIN, B.rows must be exactly 10 (when using MyISAM):
Z
In next EXPLAIN, B.rows must be exactly 10:
explain select * from t2 A, t2 B where A.a=5 and A.b=5 and A.C<5 explain select * from t2 A, t2 B where A.a=5 and A.b=5 and A.C<5
and B.a=5 and B.b=A.e and (B.b =1 or B.b = 3 or B.b=5); and B.a=5 and B.b=A.e and (B.b =1 or B.b = 3 or B.b=5);
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra

3
mysql-test/suite/pbxt/t/select.test
View File

@ -2910,8 +2910,9 @@ insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
create table t2 (a int, b int, c int, e int, primary key(a,b,c)); create table t2 (a int, b int, c int, e int, primary key(a,b,c));
insert into t2 select A.a, B.a, C.a, C.a from t1 A, t1 B, t1 C; insert into t2 select A.a, B.a, C.a, C.a from t1 A, t1 B, t1 C;
analyze table t2; analyze table t2;
select 'In next EXPLAIN, B.rows must be exactly 10:' Z; -- echo In next EXPLAIN, B.rows must be exactly 10 (when using MyISAM):
# We mask out the 'rows' column because it may differ from run to run
--replace_column 9 # --replace_column 9 #
explain select * from t2 A, t2 B where A.a=5 and A.b=5 and A.C<5 explain select * from t2 A, t2 B where A.a=5 and A.b=5 and A.C<5
and B.a=5 and B.b=A.e and (B.b =1 or B.b = 3 or B.b=5); and B.a=5 and B.b=A.e and (B.b =1 or B.b = 3 or B.b=5);

8
storage/maria/ma_loghandler.c
View File

@ -2537,14 +2537,6 @@ my_bool translog_prev_buffer_flush_wait(struct st_translog_buffer *buffer)
LSN_IN_PARTS(buffer->prev_sent_to_disk), LSN_IN_PARTS(buffer->prev_sent_to_disk),
LSN_IN_PARTS(buffer->prev_buffer_offset))); LSN_IN_PARTS(buffer->prev_buffer_offset)));
translog_buffer_lock_assert_owner(buffer); translog_buffer_lock_assert_owner(buffer);
/*
if prev_sent_to_disk == LSN_IMPOSSIBLE then
prev_buffer_offset should be LSN_IMPOSSIBLE
because it means that this buffer was never used
*/
DBUG_ASSERT((buffer->prev_sent_to_disk == LSN_IMPOSSIBLE &&
buffer->prev_buffer_offset == LSN_IMPOSSIBLE) ||
buffer->prev_sent_to_disk != LSN_IMPOSSIBLE);
if (buffer->prev_buffer_offset != buffer->prev_sent_to_disk) if (buffer->prev_buffer_offset != buffer->prev_sent_to_disk)
{ {
do { do {

2
storage/maria/maria_chk.c
View File

@ -1339,12 +1339,12 @@ static int maria_chk(HA_CHECK *param, char *filename)
maria_lock_database(info, F_UNLCK); maria_lock_database(info, F_UNLCK);
end2: end2:
end_pagecache(maria_pagecache, 1);
if (maria_close(info)) if (maria_close(info))
{ {
_ma_check_print_error(param, default_close_errmsg, my_errno, filename); _ma_check_print_error(param, default_close_errmsg, my_errno, filename);
DBUG_RETURN(1); DBUG_RETURN(1);
} }
end_pagecache(maria_pagecache, 1);
if (error == 0) if (error == 0)
{ {
if (param->out_flag & O_NEW_DATA) if (param->out_flag & O_NEW_DATA)

4
storage/maria/maria_pack.c
View File

@ -690,6 +690,8 @@ static int compress(PACK_MRG_INFO *mrg,char *result_table)
error|=my_close(new_file,MYF(MY_WME)); error|=my_close(new_file,MYF(MY_WME));
if (!result_table) if (!result_table)
{ {
(void) flush_pagecache_blocks(isam_file->s->pagecache, &isam_file->dfile,
FLUSH_RELEASE);
error|=my_close(isam_file->dfile.file, MYF(MY_WME)); error|=my_close(isam_file->dfile.file, MYF(MY_WME));
isam_file->dfile.file= -1; /* Tell maria_close file is closed */ isam_file->dfile.file= -1; /* Tell maria_close file is closed */
isam_file->s->bitmap.file.file= -1; isam_file->s->bitmap.file.file= -1;
@ -763,13 +765,13 @@ static int compress(PACK_MRG_INFO *mrg,char *result_table)
DBUG_RETURN(0); DBUG_RETURN(0);
err: err:
end_pagecache(maria_pagecache, 1);
free_counts_and_tree_and_queue(huff_trees,trees,huff_counts,fields); free_counts_and_tree_and_queue(huff_trees,trees,huff_counts,fields);
if (new_file >= 0) if (new_file >= 0)
VOID(my_close(new_file,MYF(0))); VOID(my_close(new_file,MYF(0)));
if (join_maria_file >= 0) if (join_maria_file >= 0)
VOID(my_close(join_maria_file,MYF(0))); VOID(my_close(join_maria_file,MYF(0)));
mrg_close(mrg); mrg_close(mrg);
end_pagecache(maria_pagecache, 1);
VOID(fprintf(stderr, "Aborted: %s is not compressed\n", org_name)); VOID(fprintf(stderr, "Aborted: %s is not compressed\n", org_name));
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }