database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

After merge fixes

Browse Source 
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
This commit is contained in:
unknown
2003-03-20 21:35:03 +02:00
parent 97cd4fb127
commit e968e3b18f
9 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/table.cc
View File

@ -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);