summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
authorunknown <stewart@willster.(none)>2006-11-08 17:09:16 +1100
committerunknown <stewart@willster.(none)>2006-11-08 17:09:16 +1100
commit42c2a2cb50aa3676efc4d5cd903efcf59702e83a (patch)
tree55f02647198a5251eb0f03ab994d39d81cb45601 /sql/sql_show.cc
parentb1a3c4e7c6ab6232c9324eb6757497ca24863baf (diff)
downloadmariadb-git-42c2a2cb50aa3676efc4d5cd903efcf59702e83a.tar.gz
fix runtime warning of freeing null ptr
sql/sql_show.cc: fix warning during mysql-test-run of freeing null pointer
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r--sql/sql_show.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 15a1eaaaef5..34f022d9478 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -3979,10 +3979,12 @@ static void store_schema_partitions_record(THD *thd, TABLE *schema_table,
{
char *ts= showing_table->file->get_tablespace_name(thd);
if(ts)
+ {
table->field[24]->store(ts, strlen(ts), cs);
+ my_free(ts, MYF(0));
+ }
else
table->field[24]->set_null();
- my_free(ts, MYF(0));
}
}
return;