diff options
| author | unknown <jimw@mysql.com> | 2005-05-18 15:40:34 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-05-18 15:40:34 -0700 |
| commit | 9f02364e4f2ea7d5c6e60ef5abf096b9f6bbe157 (patch) | |
| tree | 071466396e0dac3bb0931f223d394f00f19fbde1 /sql/sql_insert.cc | |
| parent | db69bf2dfdb181e2f37fc7e9e90cf0b4a2e9c166 (diff) | |
| download | mariadb-git-9f02364e4f2ea7d5c6e60ef5abf096b9f6bbe157.tar.gz | |
Fixes to merge from 4.1
client/mysqldump.c:
Temporarily disable unused (and broken) code.
mysql-test/r/group_min_max.result:
Update results
mysql-test/r/mysqldump.result:
Update results
mysql-test/r/subselect.result:
Update results
mysql-test/t/group_min_max.test:
Ignore number of rows in output of most explain results
sql/sql_insert.cc:
Fix reference to max_unique_length
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 2eeb23f97c4..0bd9099ede1 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_safe_afree(key,table->max_unique_length,MAX_KEY_LENGTH); + my_safe_afree(key,table->s->max_unique_length,MAX_KEY_LENGTH); info->last_errno= error; table->file->print_error(error,MYF(0)); DBUG_RETURN(1); |