database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge with 4.0

Browse Source 
BitKeeper/etc/logging_ok:
  auto-union
Docs/Support/texi2html:
  Auto merged
innobase/trx/trx0rec.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysys/thr_lock.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/sql_acl.cc:
  Keep old code
This commit is contained in:
unknown
2004-10-20 16:24:28 +03:00
parent 7bdb93aa7e ec8779e95a
commit 560d7bcdd0
17 changed files with 254 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_base.cc
View File

@ -818,6 +818,7 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
table->query_id=thd->query_id;
table->clear_query_id=1;
thd->tmp_table_used= 1;
DBUG_PRINT("info",("Using temporary table"));
goto reset;
}
}
@ -832,6 +833,7 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
table->query_id != thd->query_id)
{
table->query_id=thd->query_id;
DBUG_PRINT("info",("Using locked table"));
goto reset;
}
}