database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Added connect_timeout and fix for transactions per statement

Browse Source 
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.12_20smp_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.1_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-pg-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.12_20smp_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.1_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-pg-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.12_20smp_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.1_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-pg-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.12_20smp_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.1_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-pg-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.12_20smp_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.1_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-pg-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-Linux_2.2.12_20smp_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-Linux_2.2.1_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-pg-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.12_20smp_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.1_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-pg-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-Linux_2.2.12_20smp_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-Linux_2.2.1_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-pg-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.12_20smp_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.1_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-pg-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql-Linux_dynamic:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql-Linux_pgcc:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql-Linux_static:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql_fast-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql_local_tcp-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql_new-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-Linux_dynamic:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-Linux_pgcc:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-Linux_static:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql_fast-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql_local_tcp-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql_new-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-Linux_dynamic:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-Linux_pgcc:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-Linux_static:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql_fast-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql_local_tcp-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql_new-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-Linux_dynamic:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-Linux_pgcc:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-Linux_static:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql_fast-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql_local_tcp-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql_new-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-Linux_dynamic:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-Linux_pgcc:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-Linux_static:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql_fast-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql_local_tcp-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql_new-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-Linux_dynamic:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-Linux_pgcc:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-Linux_static:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql_fast-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql_local_tcp-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql_new-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-Linux_dynamic:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-Linux_pgcc:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-Linux_static:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql_fast-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql_local_tcp-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql_new-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-Linux_dynamic:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-Linux_pgcc:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-Linux_static:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql_fast-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql_local_tcp-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql_new-Linux_2.0.33_i586:
  ***MISSING WEAVE***
Docs/Makefile.am:
  Removed manual.pdf from the standard distribution
Docs/manual.texi:
  Updated table maintaince and timeouts
Makefile.am:
  Added missing targets
client/mysql.cc:
  Added -O connect_timeout
client/mysqladmin.c:
  Added -O connect_timeout
configure.in:
  3.23.29
libmysql/libmysql.c:
  Added connect_timeout
myisam/mi_check.c:
  Fixed warning i CHECK TABLE
myisam/mi_create.c:
  cleanup
sql-bench/bench-init.pl.sh:
  Updated version
sql/ha_berkeley.cc:
  Fixed bug in transaction pre statement
sql/sql_select.cc:
  removed 'explain' from slow query log
support-files/mysql.server.sh:
  Added locks
This commit is contained in:
unknown
2000-11-27 02:28:41 +02:00
parent c754d33186
commit 1b337e01d5
22 changed files with 377 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/ha_berkeley.cc
View File

@ -171,7 +171,8 @@ bool berkeley_flush_logs()
int berkeley_commit(THD *thd, void *trans)
{
DBUG_ENTER("berkeley_commit");
DBUG_PRINT("trans",("ending transaction"));
DBUG_PRINT("trans",("ending transaction %s",
trans == thd->transaction.stmt.bdb_tid ? "stmt" : "all"));
int error=txn_commit((DB_TXN*) trans,0);
#ifndef DBUG_OFF
if (error)
@ -183,7 +184,8 @@ int berkeley_commit(THD *thd, void *trans)
int berkeley_rollback(THD *thd, void *trans)
{
DBUG_ENTER("berkeley_rollback");
DBUG_PRINT("trans",("aborting transaction"));
DBUG_PRINT("trans",("aborting transaction %s",
trans == thd->transaction.stmt.bdb_tid ? "stmt" : "all"));
int error=txn_abort((DB_TXN*) trans);
DBUG_RETURN(error);
}
@ -1350,7 +1352,7 @@ int ha_berkeley::external_lock(THD *thd, int lock_type)
if (!thd->transaction.bdb_lock_count++)
{
/* First table lock, start transaction */
if (!(thd->options & (OPTION_NOT_AUTO_COMMIT | OPTION_BEGIN)) &&
if ((thd->options & (OPTION_NOT_AUTO_COMMIT | OPTION_BEGIN)) &&
!thd->transaction.all.bdb_tid)
{
/* We have to start a master transaction */