diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-11-26 09:00:41 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-11-26 09:00:41 +0100 |
| commit | fe280afa26ba21f6c1ba3edc83e930eff96704d0 (patch) | |
| tree | 198fef3c0399dd79a990104be1deec976b3ae8ea /sql/unireg.cc | |
| parent | ae5ec36bcb2f20fc63c7b069330d3b826a68f9da (diff) | |
| parent | a905ac34b59731bb69a036306297c50742753329 (diff) | |
| download | mariadb-git-fe280afa26ba21f6c1ba3edc83e930eff96704d0.tar.gz | |
Merge mysql.com:/misc/mysql/31752_/41-31752_
into mysql.com:/misc/mysql/31752_/50-31752_
sql/log.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
strings/strmake.c:
Auto merged
sql/sql_show.cc:
manually merged
sql/unireg.cc:
manual merge
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 d8e63bb78e1..4c980552f9e 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -165,6 +165,9 @@ bool mysql_create_frm(THD *thd, my_string 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 if (my_pwrite(file,(byte*) fileinfo,64,0L,MYF_RW) || my_pwrite(file,(byte*) keybuff,key_info_length, (ulong) uint2korr(fileinfo+6),MYF_RW)) |