mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Added connect_timeout and fix for transactions per statement
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:
@@ -83,6 +83,11 @@ case "$mode" in
|
||||
# be overwritten at next upgrade.
|
||||
$bindir/safe_mysqld \
|
||||
--datadir=$datadir --pid-file=$pid_file &
|
||||
# Make lock for RedHat / SuSE
|
||||
if test -d /var/lock/subsys
|
||||
then
|
||||
touch /var/lock/subsys/mysql
|
||||
fi
|
||||
else
|
||||
echo "Can't execute $bindir/safe_mysqld"
|
||||
fi
|
||||
@@ -109,6 +114,11 @@ case "$mode" in
|
||||
elif [ -n "$flags" ]
|
||||
then echo " done"
|
||||
fi
|
||||
# delete lock for RedHat / SuSE
|
||||
if test -d /var/lock/subsys
|
||||
then
|
||||
rm /var/lock/subsys/mysql
|
||||
fi
|
||||
else
|
||||
echo "No mysqld pid file found. Looked for $pid_file."
|
||||
fi
|
||||
|
Reference in New Issue
Block a user