diff options
| author | unknown <igor@rurik.mysql.com> | 2006-11-01 14:50:14 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-11-01 14:50:14 -0800 |
| commit | 0e69c252a17e6b5753079bc6313f2b7ac6fe1e66 (patch) | |
| tree | 21a8ce870c8dc48dc38623d1004a608f26e8b280 /sql/sql_table.cc | |
| parent | 361f0468dba471aa0355214653244c14b3dd18a5 (diff) | |
| parent | 2a7cf59fc92ce322671bb687e2941275dd23d1c5 (diff) | |
| download | mariadb-git-0e69c252a17e6b5753079bc6313f2b7ac6fe1e66.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.0-opt
into rurik.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug21727
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/filesort.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/records.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index f6dbba4aa79..3fc74ad1371 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -2267,7 +2267,6 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, goto send_result; } - table->table->pos_in_table_list= table; if ((table->table->db_stat & HA_READ_ONLY) && open_for_modify) { char buff[FN_REFLEN + MYSQL_ERRMSG_SIZE]; @@ -4257,8 +4256,6 @@ bool mysql_checksum_table(THD *thd, TABLE_LIST *tables, HA_CHECK_OPT *check_opt) } else { - t->pos_in_table_list= table; - if (t->file->table_flags() & HA_HAS_CHECKSUM && !(check_opt->flags & T_EXTEND)) protocol->store((ulonglong)t->file->checksum()); |