diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-01-14 11:31:09 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-01-14 11:31:09 +0100 |
| commit | 563da78d579f534e139f2e2b5e9c53d65d2d42af (patch) | |
| tree | c873611a68d10dd0ffd64df665d949422a63c22a | |
| parent | ff7f5879b533f246ff7ca784aebdfe3ea3128761 (diff) | |
| download | mariadb-git-563da78d579f534e139f2e2b5e9c53d65d2d42af.tar.gz | |
Removed some old comments.
mysys/my_handler.c:
Fixed typo
| -rw-r--r-- | mysys/my_handler.c | 2 | ||||
| -rw-r--r-- | sql/opt_subselect.cc | 3 | ||||
| -rw-r--r-- | sql/sql_select.cc | 9 |
3 files changed, 2 insertions, 12 deletions
diff --git a/mysys/my_handler.c b/mysys/my_handler.c index efee04194f7..79b0f020a85 100644 --- a/mysys/my_handler.c +++ b/mysys/my_handler.c @@ -659,7 +659,7 @@ void my_handler_error_register(void) /* If you got compilation error here about compile_time_assert array, check that every HA_ERR_xxx constant has a corresponding error message in - handler_error_messages[] list (check mysys/ma_handler_errors.h and + handler_error_messages[] list (check mysys/my_handler_errors.h and include/my_base.h). */ compile_time_assert(HA_ERR_FIRST + array_elements(handler_error_messages) == diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 633b6b11516..675717573c6 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -2741,9 +2741,6 @@ TABLE *create_duplicate_weedout_tmp_table(THD *thd, field->set_table_name(&table->alias); } - //param->recinfo=recinfo; - //store_record(table,s->default_values); // Make empty default record - if (thd->variables.tmp_table_size == ~ (ulonglong) 0) // No limit share->max_rows= ~(ha_rows) 0; else diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 757669e0f9f..0e173d940f8 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -38,12 +38,6 @@ #include <my_bit.h> #include <hash.h> #include <ft_global.h> -//#if defined(WITH_ARIA_STORAGE_ENGINE) && defined(USE_MARIA_FOR_TMP_TABLES) -//#include "../storage/maria/ha_maria.h" -//#define TMP_ENGINE_HTON maria_hton -//#else -//#define TMP_ENGINE_HTON myisam_hton -//#endif const char *join_type_str[]={ "UNKNOWN","system","const","eq_ref","ref", "MAYBE_REF","ALL","range","index","fulltext", @@ -12076,7 +12070,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, } param->copy_field_end=copy; - param->recinfo=recinfo; + param->recinfo= recinfo; // Pointer to after last field store_record(table,s->default_values); // Make empty default record if (thd->variables.tmp_table_size == ~ (ulonglong) 0) // No limit @@ -12177,7 +12171,6 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, indexes on blobs with arbitrary length. Such indexes cannot be used for lookups. */ - //// psergey-merge: using_unique_constraint=1; share->uniques= 1; } null_pack_length-=hidden_null_pack_length; |