diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-10-01 18:27:32 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-10-01 18:27:32 +0300 |
| commit | ca672e6b61d8e8f4d1c092a1f8a9c0e4f3f19027 (patch) | |
| tree | b8c1cf4e76aa783227756dab2c18d611424e5878 /sql/sql_base.cc | |
| parent | f715c9c205a99c1d97cb0f9630fc52e1a916a78d (diff) | |
| parent | 255187b2793e313cb50c1e0f1fe22272b76d3ec3 (diff) | |
| download | mariadb-git-ca672e6b61d8e8f4d1c092a1f8a9c0e4f3f19027.tar.gz | |
Automatic merge
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 0dd1ef73463..e6ec4f4e7ff 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2341,7 +2341,8 @@ bool reopen_name_locked_table(THD* thd, TABLE_LIST* table_list, bool link_in) table->tablenr=thd->current_tablenr++; table->used_fields=0; table->const_table=0; - table->null_row= table->maybe_null= 0; + table->null_row= 0; + table->maybe_null= 0; table->force_index= table->force_index_order= table->force_index_group= 0; table->status=STATUS_NO_RECORD; DBUG_RETURN(FALSE); @@ -3007,7 +3008,8 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root, table->tablenr=thd->current_tablenr++; table->used_fields=0; table->const_table=0; - table->null_row= table->maybe_null= 0; + table->null_row= 0; + table->maybe_null= 0; table->force_index= table->force_index_order= table->force_index_group= 0; table->status=STATUS_NO_RECORD; table->insert_values= 0; |