diff options
| author | monty@mysql.com <> | 2004-05-05 12:31:17 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-05-05 12:31:17 +0300 |
| commit | 7e3cf5958cf304d12c005eb06fdfb3f23b026645 (patch) | |
| tree | e86d7e05dcc63cb8a7b131d757d0f6d9308aa24f /sql/sql_load.cc | |
| parent | 59ddd8c7383ae69009c8570d427a4e15ccf2a357 (diff) | |
| download | mariadb-git-7e3cf5958cf304d12c005eb06fdfb3f23b026645.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)
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; |