mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-09 08:34:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

Updates for innobase

Browse source 
Removed a ' that casued 'make paper' to fail


Docs/manual.texi:
  Updated myisamchk section;  Removed a ' that casued 'make paper' to fail
sql/handler.cc:
  Updates for innobase
sql/mysqld.cc:
  Updates for innobase
sql/sql_parse.cc:
  Fixed possible overrun if the mysqld server name is too big
sql/sql_select.cc:
  Updates for innobase
This commit is contained in:
unknown 2001-02-15 18:00:30 +02:00
commit f5fefc94f2
5 changed files with 87 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

20
sql/sql_select.cc
View file

@ -475,6 +475,26 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
make_join_readinfo(&join,
(select_options & SELECT_DESCRIBE) | SELECT_USE_CACHE);
/* Need to tell Innobase that to play it safe, it should fetch all
columns of the tables: this is because MySQL
may build row pointers for the rows, and for all columns of the primary
key the field->query_id has not necessarily been set to thd->query_id
by MySQL. */
#ifdef HAVE_INNOBASE_DB
if (need_tmp || select_distinct || group || order)
{
for (uint i_h = join.const_tables; i_h < join.tables; i_h++)
{
JOIN_TAB* tab_h = join.join_tab + i_h;
TABLE* table_h = tab_h->table;
if (table_h->db_type == DB_TYPE_INNOBASE)
table_h->file->extra(HA_EXTRA_RESTORE_POS);
}
}
#endif
DBUG_EXECUTE("info",TEST_join(&join););
/*
Because filesort always does a full table scan or a quick range scan