automatic merge

This commit is contained in:
Michael Widenius 2010-11-09 10:20:09 +02:00
commit aa34668f64
10 changed files with 56 additions and 33 deletions

View file

@ -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