database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge fix.

Browse Source
This commit is contained in:
Jan Lindström
2013-09-09 10:38:58 +03:00
parent 0880db5640
commit 9c85ced30d
13 changed files with 857 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_show.cc
View File

@ -59,6 +59,10 @@
#include "debug_sync.h"
#include "keycaches.h"
#if !defined(MYSQL_MAX_VARIABLE_VALUE_LEN)
#define MYSQL_MAX_VARIABLE_VALUE_LEN 1024
#endif // !defined(MYSQL_MAX_VARIABLE_VALUE_LEN)
#ifdef WITH_PARTITION_STORAGE_ENGINE
#include "ha_partition.h"
#endif
@ -8660,7 +8664,7 @@ ST_FIELD_INFO variables_fields_info[]=
{
{"VARIABLE_NAME", 64, MYSQL_TYPE_STRING, 0, 0, "Variable_name",
SKIP_OPEN_TABLE},
{"VARIABLE_VALUE", 1024, MYSQL_TYPE_STRING, 0, 1,
{"VARIABLE_VALUE", MYSQL_MAX_VARIABLE_VALUE_LEN, MYSQL_TYPE_STRING, 0, 1,
"Value", SKIP_OPEN_TABLE},
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE}
};