summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-11-09 10:20:09 +0200
committerMichael Widenius <monty@askmonty.org>2010-11-09 10:20:09 +0200
commitaa34668f643e78cf754bee88f48236f944d7b722 (patch)
treef4f4791b3771bd6f629cdc7668897602b58dd021 /sql/sql_show.cc
parent9e008bd7261028cdac77ef995c68cba749e473e3 (diff)
parent7b047a31a09a7999353232cb6407b4e6338d5b70 (diff)
downloadmariadb-git-aa34668f643e78cf754bee88f48236f944d7b722.tar.gz
automatic merge
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r--sql/sql_show.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index e721175cbe5..d8baab6e72c 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -4329,7 +4329,7 @@ static int get_schema_column_record(THD *thd, TABLE_LIST *tables,
base_type [(dimension)] [unsigned] [zerofill].
For DATA_TYPE column we extract only base type.
*/
- tmp_buff= strchr(type.ptr(), '(');
+ tmp_buff= strchr(type.c_ptr_safe(), '(');
if (!tmp_buff)
/*
if there is no dimention part then check the presence of