diff options
| author | unknown <jimw@mysql.com> | 2005-05-18 13:54:36 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-05-18 13:54:36 -0700 |
| commit | 2de8a4bc8c821d096550ba5388c6b2dfccb4263e (patch) | |
| tree | da99bea4ccdeb25dbb92040037cff2c59bb9aacb /sql/sql_insert.cc | |
| parent | f8a20dbeb6d53fc5d993e088c245e4f2f9b085c5 (diff) | |
| parent | 9e8cad1d5a87c681b48266c96f2e1ea98052b40a (diff) | |
| download | mariadb-git-2de8a4bc8c821d096550ba5388c6b2dfccb4263e.tar.gz | |
Resolve merge from 4.1
mysql-test/r/grant_cache.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/t/grant_cache.test:
Auto merged
mysql-test/t/merge.test:
Auto merged
sql/ha_myisammrg.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/handler.h:
Resolve merge
sql/table.cc:
Resolve merge
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 849c00a6043..2eeb23f97c4 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -948,7 +948,7 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info) err: if (key) - my_afree(key); + my_safe_afree(key,table->max_unique_length,MAX_KEY_LENGTH); info->last_errno= error; table->file->print_error(error,MYF(0)); DBUG_RETURN(1); |