From 4b56b0ee43843dae2f5503718bd851f8debbd561 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 21 Mar 2001 20:13:46 +0200 Subject: Split setup_fields to setup_tables and setup_fields Fixed problem with UPDATE TABLE when keys wheren't always used. Docs/manual.texi: Added comment to ALTER TABLE scripts/mysql_install_db.sh: Added test for mysqld in libexec sql/ha_innobase.cc: Removed compiler warning sql/mysql_priv.h: Split setup_fields to setup_tables and setup_fields sql/sql_base.cc: Split setup_fields to setup_tables and setup_fields sql/sql_insert.cc: Split setup_fields to setup_tables and setup_fields sql/sql_load.cc: Split setup_fields to setup_tables and setup_fields sql/sql_parse.cc: Fixed missing 'mysql_info" with now clients. sql/sql_select.cc: Split setup_fields to setup_tables and setup_fields sql/sql_update.cc: Fixed problem with UPDATE TABLE when keys wheren't always used. sql/sql_yacc.yy: Small isolation change --- sql/sql_parse.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sql/sql_parse.cc') diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 9cb1c9b119f..5a1af55849d 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -455,7 +455,8 @@ check_connections(THD *thd) db=strend(passwd)+1; if (thd->client_capabilities & CLIENT_INTERACTIVE) thd->inactive_timeout=net_interactive_timeout; - if (thd->client_capabilities & CLIENT_TRANSACTIONS) + if ((thd->client_capabilities & CLIENT_TRANSACTIONS) && + opt_using_transactions) thd->net.return_status= &thd->server_status; net->timeout=net_read_timeout; if (check_user(thd,COM_CONNECT, user, passwd, db, 1)) -- cgit v1.2.1