summaryrefslogtreecommitdiff
path: root/sql/sql_admin.cc
diff options
context:
space:
mode:
authorSeppo Jaakola <seppo.jaakola@codership.com>2013-07-13 13:30:03 +0300
committerSeppo Jaakola <seppo.jaakola@codership.com>2013-07-13 13:30:03 +0300
commitdb0cfba638383569b1e30765e2d36e0707bfb930 (patch)
treed56bf3ec5c5804b2bd15a5eceddb14b5520b3d2e /sql/sql_admin.cc
parent0a9216835f406947fb4d492616da4cda75e5e113 (diff)
parenta057b504904c3e6ab1e3006c081b4fb23faaf1d4 (diff)
downloadmariadb-git-db0cfba638383569b1e30765e2d36e0707bfb930.tar.gz
Merged with lp:maria revision #3766
Diffstat (limited to 'sql/sql_admin.cc')
-rw-r--r--sql/sql_admin.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index a9b7624af3c..d08cd7915ab 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -329,7 +329,8 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
item->maybe_null = 1;
field_list.push_back(item = new Item_empty_string("Msg_type", 10));
item->maybe_null = 1;
- field_list.push_back(item = new Item_empty_string("Msg_text", 255));
+ field_list.push_back(item = new Item_empty_string("Msg_text",
+ SQL_ADMIN_MSG_TEXT_SIZE));
item->maybe_null = 1;
if (protocol->send_result_set_metadata(&field_list,
Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))