summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-10-22 22:25:04 +0400
committerAlexander Nozdrin <alik@sun.com>2009-10-22 22:25:04 +0400
commitd18d2dc8dc06f03bc09bdb696bdf324d60f17241 (patch)
tree0958918b5396ef944e2afa2cb6364d60e326f79f /sql/sql_table.cc
parent9434e604fab0afb7e7914d0d24c1d915f06fb3c3 (diff)
parentbd83ad899336c0e4a2212d6f05285c5b94e9f912 (diff)
downloadmariadb-git-d18d2dc8dc06f03bc09bdb696bdf324d60f17241.tar.gz
Automerge from mysql-next-mr-runtime.
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 2d7f85384a1..a61878a5eba 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -4530,7 +4530,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
item->maybe_null = 1;
field_list.push_back(item = new Item_empty_string("Msg_text", 255));
item->maybe_null = 1;
- if (protocol->send_fields(&field_list,
+ if (protocol->send_result_set_metadata(&field_list,
Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
DBUG_RETURN(TRUE);
@@ -7825,7 +7825,7 @@ bool mysql_checksum_table(THD *thd, TABLE_LIST *tables,
field_list.push_back(item= new Item_int("Checksum", (longlong) 1,
MY_INT64_NUM_DECIMAL_DIGITS));
item->maybe_null= 1;
- if (protocol->send_fields(&field_list,
+ if (protocol->send_result_set_metadata(&field_list,
Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
DBUG_RETURN(TRUE);