diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-11-26 09:19:30 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-11-26 09:19:30 +0100 |
| commit | d7d7b10b532691186d047e44cb200b30a59c4d75 (patch) | |
| tree | 04b3a63eff036ac7a73739d3a0f05402d87deecd /sql/unireg.cc | |
| parent | 7ba06230a72d2c76f4c01d19ae0087296ef11301 (diff) | |
| parent | 1c72446ef69cf6c50cf9b2dae69b2b24a7576103 (diff) | |
| download | mariadb-git-d7d7b10b532691186d047e44cb200b30a59c4d75.tar.gz | |
Merge mysql.com:/misc/mysql/31752_/50-31752_
into mysql.com:/misc/mysql/31752_/51-31752_
client/mysql.cc:
Auto merged
sql/log.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sp.cc:
manual merge
strings/strmake.c:
SCCS merged
sql/unireg.cc:
SCCS merged
Diffstat (limited to 'sql/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index f2238d69973..8f2d10d4e2a 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -227,6 +227,9 @@ bool mysql_create_frm(THD *thd, const char *file_name, strmake((char*) forminfo+47, create_info->comment.str ? create_info->comment.str : "", create_info->comment.length); forminfo[46]=(uchar) create_info->comment.length; +#ifdef EXTRA_DEBUG + memset((char*) forminfo+47 + forminfo[46], 0, 61 - forminfo[46]); +#endif #ifdef WITH_PARTITION_STORAGE_ENGINE if (part_info) { |