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/sql_load.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/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 3d9299ca05c..f72fab9ea3a 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -529,8 +529,8 @@ read_sep_field(THD *thd,COPY_INFO &info,TABLE *table, if (field->type() == FIELD_TYPE_TIMESTAMP) ((Field_timestamp*) field)->set_time(); else if (field != table->next_number_field) - field->set_warning((uint)MYSQL_ERROR::WARN_LEVEL_WARN, - ER_WARN_NULL_TO_NOTNULL); + field->set_warning((uint) MYSQL_ERROR::WARN_LEVEL_WARN, + ER_WARN_NULL_TO_NOTNULL); } continue; } @@ -1014,7 +1014,7 @@ bool READ_INFO::find_start_of_fields() { // Can't be line_start PUSH(chr); while (--ptr != line_start_ptr) - { // Restart with next char + { // Restart with next char PUSH((uchar) *ptr); } goto try_again; |