diff options
| -rw-r--r-- | myisam/mi_dbug.c | 4 | ||||
| -rw-r--r-- | sql/opt_range.cc | 15 | ||||
| -rw-r--r-- | sql/sql_update.cc | 2 |
3 files changed, 12 insertions, 9 deletions
diff --git a/myisam/mi_dbug.c b/myisam/mi_dbug.c index 482287938c0..fe5b36fd304 100644 --- a/myisam/mi_dbug.c +++ b/myisam/mi_dbug.c @@ -137,6 +137,10 @@ void _mi_print_key(FILE *stream, register MI_KEYSEG *keyseg, { uint tmp_length; get_key_length(tmp_length,key); + /* + The following command sometimes gives a warning from valgrind. + Not yet sure if the bug is in valgrind, glibc or mysqld + */ VOID(fprintf(stream,"%.*s",(int) tmp_length,key)); key+=tmp_length; break; diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 74fa237fd73..74e3f855db7 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -1062,7 +1062,7 @@ get_mm_leaf(PARAM *param, Field *field, KEY_PART *key_part, if (field->key_type() == HA_KEYTYPE_VARTEXT) copies= 2; str= str2= (char*) alloc_root(param->mem_root, - (key_part->part_length+maybe_null)*copies); + (key_part->part_length+maybe_null)*copies+1); if (!str) DBUG_RETURN(0); if (maybe_null) @@ -1078,16 +1078,15 @@ get_mm_leaf(PARAM *param, Field *field, KEY_PART *key_part, uint length= uint2korr(str+maybe_null); char *end; str2= str+ key_part->part_length + maybe_null; - /* remove end space. The 2 is for the packed length */ - while (length > 0 && str[length+2+maybe_null-1] == ' ') + /* remove end space */ + while (length > 0 && str[length+HA_KEY_BLOB_LENGTH+maybe_null-1] == ' ') length--; int2store(str+maybe_null, length); /* Create key that is space filled */ - memcpy(str2, str, length+2+maybe_null); - end= str2+ maybe_null + key_part->part_length; - for (char *pos= str2+ 2+ length + maybe_null; pos < end ; pos++) - *pos++= ' '; - int2store(str2+maybe_null, key_part->part_length); + memcpy(str2, str, length + HA_KEY_BLOB_LENGTH + maybe_null); + bfill(str2+ length+ HA_KEY_BLOB_LENGTH +maybe_null, + key_part->part_length-length - HA_KEY_BLOB_LENGTH, ' '); + int2store(str2+maybe_null, key_part->part_length - HA_KEY_BLOB_LENGTH); } if (!(tree=new SEL_ARG(field,str,str2))) DBUG_RETURN(0); // out of memory diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 36ceef23740..27b498d350f 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -440,7 +440,7 @@ multi_update::multi_update(THD *thd_arg, TABLE_LIST *table_list, :all_tables(table_list), update_tables(0), thd(thd_arg), tmp_tables(0), updated(0), found(0), fields(field_list), values(value_list), table_count(0), copy_field(0), handle_duplicates(handle_duplicates_arg), - do_update(1), trans_safe(0) + do_update(1), trans_safe(0), transactional_tables(1) {} |