diff options
| author | unknown <tnurnberg@mysql.com/white.intern.koehntopp.de> | 2007-12-17 09:16:47 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@mysql.com/white.intern.koehntopp.de> | 2007-12-17 09:16:47 +0100 |
| commit | ba0506676b52f2ced84c5064f5358c57ba0ba603 (patch) | |
| tree | 4501d7a748c3148dabe656360170ab39f6a95794 /sql/unireg.cc | |
| parent | 5ce7cdbe54667610f3ab1acf849985d637472e1d (diff) | |
| parent | 02cdb7eccab6fe262d4a9d430f9d23eb51ac4839 (diff) | |
| download | mariadb-git-ba0506676b52f2ced84c5064f5358c57ba0ba603.tar.gz | |
Merge mysql.com:/misc/mysql/31752_/50-31752_
into mysql.com:/misc/mysql/31752_/51-31752_
mysys/mf_pack.c:
Auto merged
sql/log.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/unireg.cc:
Auto merged
Diffstat (limited to 'sql/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index 8f2d10d4e2a..3ef1e4576e1 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -228,6 +228,11 @@ bool mysql_create_frm(THD *thd, const char *file_name, create_info->comment.str : "", create_info->comment.length); forminfo[46]=(uchar) create_info->comment.length; #ifdef EXTRA_DEBUG + /* + EXTRA_DEBUG causes strmake() to initialize its buffer behind the + payload with a magic value to detect wrong buffer-sizes. We + explicitly zero that segment again. + */ memset((char*) forminfo+47 + forminfo[46], 0, 61 - forminfo[46]); #endif #ifdef WITH_PARTITION_STORAGE_ENGINE |