diff options
| author | unknown <igor@rurik.mysql.com> | 2006-06-09 12:31:15 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-06-09 12:31:15 -0700 |
| commit | 87b06d0720926a980ab4ba3ab345e71c360d1fa5 (patch) | |
| tree | f7e4e23b86e4bc4560ff8e91768af3f45f0748a1 /sql | |
| parent | 2ef66fcaa0c339a983d80c0bca3c90d5d8096666 (diff) | |
| parent | 388e8843cd48a82ee4334091709f5fff958dda03 (diff) | |
| download | mariadb-git-87b06d0720926a980ab4ba3ab345e71c360d1fa5.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.1
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_base.cc | 3 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 47c55228adc..2298de7eeb5 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5343,6 +5343,7 @@ bool setup_tables(THD *thd, Name_resolution_context *context, table_list= table_list->next_leaf, tablenr++) { TABLE *table= table_list->table; + table->pos_in_table_list= table_list; if (first_select_table && table_list->top_table() == first_select_table) { @@ -5488,7 +5489,7 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table, 0) { my_error(ER_KEY_DOES_NOT_EXITS, MYF(0), name->c_ptr(), - table->alias); + table->pos_in_table_list->alias); map->set_all(); return 1; } diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index a055a8df82d..14847a9906d 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2020,7 +2020,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd, uptime, (int) thread_count, (ulong) thd->query_id, current_global_status_var.long_query_count, - current_global_status_var.opened_tables, refresh_version, cached_open_tables(), + current_global_status_var.opened_tables, refresh_version, + cached_open_tables(), (uptime ? (ulonglong2double(thd->query_id) / (double) uptime) : (double) 0)); #ifdef SAFEMALLOC |