1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/home/my/mysql-4.1


sql/sql_table.cc:
  Auto merged
This commit is contained in:
unknown 2004-03-16 00:04:07 +02:00
commit 0dbf737aa2
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_select.cc
View File

@ -842,8 +842,7 @@ JOIN::optimize()
for (uint i_h = const_tables; i_h < tables; i_h++) for (uint i_h = const_tables; i_h < tables; i_h++)
{ {
TABLE* table_h = join_tab[i_h].table; TABLE* table_h = join_tab[i_h].table;
if (table_h->db_type == DB_TYPE_INNODB) table_h->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
table_h->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
} }
} }
#endif #endif

10
sql/sql_table.cc
View File

@ -2976,12 +2976,10 @@ int mysql_checksum_table(THD *thd, TABLE_LIST *tables, HA_CHECK_OPT *check_opt)
/* calculating table's checksum */ /* calculating table's checksum */
ha_checksum crc= 0; ha_checksum crc= 0;
if (t->db_type == DB_TYPE_INNODB) { /* InnoDB must be told explicitly to retrieve all columns, because
/* InnoDB must be told explicitly to retrieve all columns, because this function does not set field->query_id in the columns to the
this function does not set field->query_id in the columns to the current query id */
current query id */ t->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
t->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
}
if (t->file->rnd_init(1)) if (t->file->rnd_init(1))
protocol->store_null(); protocol->store_null();