diff options
| author | tnurnberg@mysql.com/white.intern.koehntopp.de <> | 2007-12-17 09:48:30 +0100 |
|---|---|---|
| committer | tnurnberg@mysql.com/white.intern.koehntopp.de <> | 2007-12-17 09:48:30 +0100 |
| commit | 94d7b8273f95429bdb3563c71e986ae5c46677de (patch) | |
| tree | a1f6b2e88e3c2e89ae3afbbf8fa09f9b650591a3 /sql/unireg.cc | |
| parent | d611f84449dac437834143e23b063c93b6b0d9c7 (diff) | |
| parent | efa1061a636a2a1d4fd280971330cc190ed5dcbb (diff) | |
| download | mariadb-git-94d7b8273f95429bdb3563c71e986ae5c46677de.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into mysql.com:/misc/mysql/31752_/51-31752_
Diffstat (limited to 'sql/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index dbdefd8d5b1..aab3f5606a8 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -227,6 +227,14 @@ 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 + /* + 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 if (part_info) { |