diff options
| author | ingo@chilla.local <> | 2006-07-06 19:36:07 +0200 |
|---|---|---|
| committer | ingo@chilla.local <> | 2006-07-06 19:36:07 +0200 |
| commit | 591d461d957336b1fb7f4618a4fa6a91684e7fba (patch) | |
| tree | 32918d6b3b68267d9013a9f76bd6615f8ca0d86f /sql/table.cc | |
| parent | 4eee50de1646695770f66901bf80484a14051d83 (diff) | |
| parent | 8728fbbc6ccf34b448b5cea1f00969fac54b58c6 (diff) | |
| download | mariadb-git-591d461d957336b1fb7f4618a4fa6a91684e7fba.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.0
into chilla.local:/home/mydev/mysql-5.0-bug16218
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 83711577699..728b98b2d35 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -804,7 +804,8 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat, if (!(field->flags & BLOB_FLAG)) { // Create a new field field=key_part->field=field->new_field(&outparam->mem_root, - outparam); + outparam, + outparam == field->table); field->field_length=key_part->length; } } |