diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-03-20 21:35:03 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-03-20 21:35:03 +0200 |
| commit | e968e3b18f7cbfd51284fc5a8618178c79ec32ab (patch) | |
| tree | d3a53b10ea0018a2433b7c4e230d138a12a838db /sql/table.cc | |
| parent | 97cd4fb127f4096f2196a71778a15c8183aa7784 (diff) | |
| download | mariadb-git-e968e3b18f7cbfd51284fc5a8618178c79ec32ab.tar.gz | |
After merge fixes
Fixed bug in Item::set_name()
Fix for memory leak with geometry type
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/innodb.result:
Hack to make test repeatable
(InnoDB's cardinality numbers varies a bit between tests)
mysql-test/r/rpl_relayspace.result:
After merge fix
mysql-test/t/innodb.test:
Hack to make test repeatable
(InnoDB's cardinality numbers varies a bit between tests)
sql/ha_myisam.cc:
Indentation cleanup
sql/item.cc:
Fixed bug in Item::set_name()
sql/password.c:
After merge fix
sql/sql_update.cc:
After merge fix
sql/table.cc:
Fix for memory leak with geometry type
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index b36171cab93..17bb15d3033 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -515,6 +515,7 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, keyinfo->key_length+= HA_KEY_NULL_LENGTH; } if (field->type() == FIELD_TYPE_BLOB || + field->type() == FIELD_TYPE_GEOMETRY || field->real_type() == FIELD_TYPE_VAR_STRING) { if (field->type() == FIELD_TYPE_BLOB) @@ -531,7 +532,7 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, if (i == 0) field->key_start|= ((key_map) 1 << key); if (field->key_length() == key_part->length && - field->type() != FIELD_TYPE_BLOB) + !(field->flags & BLOB_FLAG)) { if ((index_flags & HA_KEY_READ_ONLY) && (field->key_type() != HA_KEYTYPE_TEXT || @@ -560,7 +561,7 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, if (field->key_length() != key_part->length) { key_part->key_part_flag|= HA_PART_KEY; - if (field->type() != FIELD_TYPE_BLOB) + if (!(field->flags & BLOB_FLAG)) { // Create a new field field=key_part->field=field->new_field(&outparam->mem_root, outparam); |