diff options
| author | unknown <tnurnberg@mysql.com/white.intern.koehntopp.de> | 2007-12-17 09:13:38 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@mysql.com/white.intern.koehntopp.de> | 2007-12-17 09:13:38 +0100 |
| commit | 02cdb7eccab6fe262d4a9d430f9d23eb51ac4839 (patch) | |
| tree | d9da04544a6b5068bf1a6d8cbd638b7563676d41 /sql/unireg.cc | |
| parent | 1c72446ef69cf6c50cf9b2dae69b2b24a7576103 (diff) | |
| parent | 0805384869656fc9efaa28de331e825aa8b885d7 (diff) | |
| download | mariadb-git-02cdb7eccab6fe262d4a9d430f9d23eb51ac4839.tar.gz | |
Merge mysql.com:/misc/mysql/31752_/41-31752_
into mysql.com:/misc/mysql/31752_/50-31752_
mysys/mf_pack.c:
Auto merged
sql/log.cc:
Auto merged
sql/sql_show.cc:
manual merge
sql/unireg.cc:
manual merge
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 4c980552f9e..68e8219f043 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -166,6 +166,11 @@ bool mysql_create_frm(THD *thd, my_string 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 if (my_pwrite(file,(byte*) fileinfo,64,0L,MYF_RW) || |