diff options
| author | unknown <ingo@mysql.com> | 2006-07-04 19:10:13 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-07-04 19:10:13 +0200 |
| commit | 752b826e0d890b2c3b28146089611c1982b459ed (patch) | |
| tree | c9392d011c4ed50df63ad84d1ffc540f6d4b2f21 /sql/sql_class.cc | |
| parent | f4a07612efd66a559fe06810deee5e38cd96d03c (diff) | |
| parent | 7aa26e264582964b6e4df64980edbee8cde8cbd7 (diff) | |
| download | mariadb-git-752b826e0d890b2c3b28146089611c1982b459ed.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.0-bug14400
into mysql.com:/home/mydev/mysql-4.1-bug14400
myisam/mi_rkey.c:
Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert"
Manual merge
sql/sql_class.cc:
Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert"
Manual merge
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index acca4aaa4e0..a9b5ba707ca 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -821,7 +821,7 @@ bool select_send::send_data(List<Item> &items) Protocol *protocol= thd->protocol; char buff[MAX_FIELD_WIDTH]; String buffer(buff, sizeof(buff), &my_charset_bin); - DBUG_ENTER("send_data"); + DBUG_ENTER("select_send::send_data"); protocol->prepare_for_resend(); Item *item; @@ -1032,7 +1032,7 @@ select_export::prepare(List<Item> &list, SELECT_LEX_UNIT *u) bool select_export::send_data(List<Item> &items) { - DBUG_ENTER("send_data"); + DBUG_ENTER("select_export::send_data"); char buff[MAX_FIELD_WIDTH],null_buff[2],space[MAX_FIELD_WIDTH]; bool space_inited=0; String tmp(buff,sizeof(buff),&my_charset_bin),*res; @@ -1189,7 +1189,7 @@ bool select_dump::send_data(List<Item> &items) String tmp(buff,sizeof(buff),&my_charset_bin),*res; tmp.length(0); Item *item; - DBUG_ENTER("send_data"); + DBUG_ENTER("select_dump::send_data"); if (unit->offset_limit_cnt) { // using limit offset,count |