diff options
| author | unknown <monty@tik.mysql.fi> | 2001-03-21 20:13:46 +0200 |
|---|---|---|
| committer | unknown <monty@tik.mysql.fi> | 2001-03-21 20:13:46 +0200 |
| commit | 4b56b0ee43843dae2f5503718bd851f8debbd561 (patch) | |
| tree | 9acce646cec7017f770114fcd46d65bd4d8e0bf9 /sql/sql_parse.cc | |
| parent | 6257ee7613836c397bda6c3533ca4a114d60e045 (diff) | |
| download | mariadb-git-4b56b0ee43843dae2f5503718bd851f8debbd561.tar.gz | |
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
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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)) |