diff options
| author | unknown <tnurnberg@mysql.com/white.intern.koehntopp.de> | 2007-12-17 09:48:30 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@mysql.com/white.intern.koehntopp.de> | 2007-12-17 09:48:30 +0100 |
| commit | adfbe1fb82d43e0e22d56a29cccfe71ff72eb802 (patch) | |
| tree | a1f6b2e88e3c2e89ae3afbbf8fa09f9b650591a3 /sql | |
| parent | 734c6286e9b78927aaec9ff9f433747b92a7db57 (diff) | |
| parent | ba0506676b52f2ced84c5064f5358c57ba0ba603 (diff) | |
| download | mariadb-git-adfbe1fb82d43e0e22d56a29cccfe71ff72eb802.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into mysql.com:/misc/mysql/31752_/51-31752_
client/mysql.cc:
Auto merged
sql/log.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/unireg.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log.cc | 4 | ||||
| -rw-r--r-- | sql/repl_failsafe.cc | 2 | ||||
| -rw-r--r-- | sql/sql_db.cc | 2 | ||||
| -rw-r--r-- | sql/unireg.cc | 8 |
4 files changed, 12 insertions, 4 deletions
diff --git a/sql/log.cc b/sql/log.cc index 9fdede9ef2c..05cae07d930 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -2994,10 +2994,10 @@ err: void MYSQL_BIN_LOG::make_log_name(char* buf, const char* log_ident) { uint dir_len = dirname_length(log_file_name); - if (dir_len > FN_REFLEN) + if (dir_len >= FN_REFLEN) dir_len=FN_REFLEN-1; strnmov(buf, log_file_name, dir_len); - strmake(buf+dir_len, log_ident, FN_REFLEN - dir_len); + strmake(buf+dir_len, log_ident, FN_REFLEN - dir_len -1); } diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 834d87532af..453c26725d2 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -925,7 +925,7 @@ bool load_master_data(THD* thd) 0, (SLAVE_IO | SLAVE_SQL))) my_message(ER_MASTER_INFO, ER(ER_MASTER_INFO), MYF(0)); strmake(active_mi->master_log_name, row[0], - sizeof(active_mi->master_log_name)); + sizeof(active_mi->master_log_name) -1); active_mi->master_log_pos= my_strtoll10(row[1], (char**) 0, &error_2); /* at least in recent versions, the condition below should be false */ if (active_mi->master_log_pos < BIN_LOG_HEADER_SIZE) diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 7686dc695ad..f669a242508 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -1395,7 +1395,7 @@ static void backup_current_db_name(THD *thd, } else { - strmake(saved_db_name->str, thd->db, saved_db_name->length); + strmake(saved_db_name->str, thd->db, saved_db_name->length - 1); saved_db_name->length= thd->db_length; } } 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) { |