diff options
| author | ingo/mydev@chilla.local <> | 2006-07-08 19:25:01 +0200 |
|---|---|---|
| committer | ingo/mydev@chilla.local <> | 2006-07-08 19:25:01 +0200 |
| commit | 065cdb030aac4527f08ff121b1a83925f2a23932 (patch) | |
| tree | dcb2992c80cbdf8a1c8bcc2928f005a63824f6d3 /sql/sql_class.cc | |
| parent | eaa9350c9005bf7c625660d7b54f416246da00c1 (diff) | |
| parent | 40c103478d11b8b90ffa9e1d9c18b0cb92536d62 (diff) | |
| download | mariadb-git-065cdb030aac4527f08ff121b1a83925f2a23932.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.1-bug14400
into chilla.local:/home/mydev/mysql-4.1-amerge
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 ace886c2b98..da752977fcd 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -822,7 +822,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; @@ -1033,7 +1033,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; @@ -1190,7 +1190,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 |