summaryrefslogtreecommitdiff
path: root/sql/create_options.cc
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@skysql.com>2014-04-08 10:36:34 -0400
committerNirbhay Choubey <nirbhay@skysql.com>2014-04-08 10:36:34 -0400
commit421326310168e2b0a83eddcf9520336e1d58ea42 (patch)
tree9ec49ac74c451cf03581a619eb92a7afae1c5eef /sql/create_options.cc
parent9d2e90f379654fb65c0eab006213d772302bcff7 (diff)
parent41a2ca5c16636c12d5c2adce70ec7ddb7a2fc711 (diff)
downloadmariadb-git-421326310168e2b0a83eddcf9520336e1d58ea42.tar.gz
Merging mariadb-10.0.10.
* bzr merge -rtag:mariadb-10.0.10 maria/10.0.
Diffstat (limited to 'sql/create_options.cc')
-rw-r--r--sql/create_options.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/create_options.cc b/sql/create_options.cc
index d9b1d31fd62..d60639a4f4a 100644
--- a/sql/create_options.cc
+++ b/sql/create_options.cc
@@ -395,6 +395,7 @@ static bool resolve_sysvars(handlerton *hton, ha_create_table_option *rules)
char buf[256];
String str(buf, sizeof(buf), system_charset_info);
+ str.length(0);
for (const char **s= optp.typelib->type_names; *s; s++)
{
if (str.append(*s) || str.append(','))