diff options
| author | unknown <monty@mysql.com> | 2004-05-05 12:31:17 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-05 12:31:17 +0300 |
| commit | 68d07cbcc46b7690c23e5f112ab12cba7233fd81 (patch) | |
| tree | e86d7e05dcc63cb8a7b131d757d0f6d9308aa24f /sql/item.cc | |
| parent | 030587a7a62e9aa9711cbceb5c8da45cbe041eb5 (diff) | |
| download | mariadb-git-68d07cbcc46b7690c23e5f112ab12cba7233fd81.tar.gz | |
Fixed crashing bug with alter table when table was in use (Bug #3643)
We didn't use 'only index' for tables of type 'const'. (Bug #3497)
mysql-test/r/func_str.result:
New testfin
mysql-test/r/key.result:
New test
mysql-test/r/key_primary.result:
Update after "We didn't use 'only index' for tables of type 'const'" fix.
mysql-test/r/null_key.result:
Update after "We didn't use 'only index' for tables of type 'const'" fix.
mysql-test/r/subselect.result:
Update after "We didn't use 'only index' for tables of type 'const'" fix.
mysql-test/t/func_str.test:
Updated bug texts
Added test for conversion of long string value to integer (Bug #3472)
mysql-test/t/key.test:
Test of key read with primary key (Bug #3497)
sql/item.cc:
Added assert
sql/sql_base.cc:
Fixed crashing bug with alter table when table was in use (Bug #3643)
sql/sql_load.cc:
Indentation fixes
sql/sql_select.cc:
We didn't use 'only index' for tables of type 'const'. (Bug #3497)
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index 72583ea02bb..86acd2850c8 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1227,15 +1227,16 @@ Field *Item::tmp_table_field_from_field_type(TABLE *table) void Item_field::make_field(Send_field *tmp_field) { field->make_field(tmp_field); + DBUG_ASSERT(tmp_field->table_name); if (name) tmp_field->col_name=name; // Use user supplied name } + /* -** Set a field:s value from a item + Set a field:s value from a item */ - void Item_field::save_org_in_field(Field *to) { if (field->is_null()) |