-diff -r 592f6c3641ba BUILD/Makefile.in
+diff -ruN a/BUILD/Makefile.in b/BUILD/Makefile.in
--- a/BUILD/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/BUILD/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -146,6 +146,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba Docs/Makefile.in
+diff -ruN a/Docs/Makefile.in b/Docs/Makefile.in
--- a/Docs/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/Docs/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -144,6 +144,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba Makefile.in
+diff -ruN a/Makefile.in b/Makefile.in
--- a/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -171,6 +171,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba SSL/Makefile.in
+diff -ruN a/SSL/Makefile.in b/SSL/Makefile.in
--- a/SSL/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/SSL/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -144,6 +144,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba client/Makefile.in
+diff -ruN a/client/Makefile.in b/client/Makefile.in
--- a/client/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/client/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -247,6 +247,7 @@
LIBS = @CLIENT_LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba cmd-line-utils/Makefile.in
+diff -ruN a/cmd-line-utils/Makefile.in b/cmd-line-utils/Makefile.in
--- a/cmd-line-utils/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/cmd-line-utils/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -157,6 +157,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba cmd-line-utils/libedit/Makefile.in
+diff -ruN a/cmd-line-utils/libedit/Makefile.in b/cmd-line-utils/libedit/Makefile.in
--- a/cmd-line-utils/libedit/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/cmd-line-utils/libedit/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -166,6 +166,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba cmd-line-utils/readline/Makefile.in
+diff -ruN a/cmd-line-utils/readline/Makefile.in b/cmd-line-utils/readline/Makefile.in
--- a/cmd-line-utils/readline/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/cmd-line-utils/readline/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -173,6 +173,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba configure
-diff -r 592f6c3641ba configure.in
+diff -ruN a/configure b/configure
+diff -ruN a/configure.in b/configure.in
--- a/configure.in Wed Jul 29 13:33:34 2009 -0700
+++ b/configure.in Wed Jul 29 13:34:11 2009 -0700
-@@ -2136,7 +2136,18 @@
+@@ -2140,7 +2140,18 @@
# We also disable for SCO for the time being, the headers for the
# thread library we use conflicts with other headers.
;;
;;
esac
-@@ -2772,7 +2783,7 @@
+@@ -2776,7 +2787,7 @@
AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])
fi
AC_SUBST(CLIENT_LIBS)
AC_SUBST(NON_THREADED_LIBS)
-diff -r 592f6c3641ba dbug/Makefile.in
+diff -ruN a/dbug/Makefile.in b/dbug/Makefile.in
--- a/dbug/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/dbug/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -192,6 +192,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba extra/Makefile.in
+diff -ruN a/extra/Makefile.in b/extra/Makefile.in
--- a/extra/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/extra/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -240,6 +240,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba extra/yassl/Makefile.in
+diff -ruN a/extra/yassl/Makefile.in b/extra/yassl/Makefile.in
--- a/extra/yassl/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/extra/yassl/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -142,6 +142,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba extra/yassl/src/Makefile.in
+diff -ruN a/extra/yassl/src/Makefile.in b/extra/yassl/src/Makefile.in
--- a/extra/yassl/src/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/extra/yassl/src/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -151,6 +151,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba extra/yassl/taocrypt/Makefile.in
+diff -ruN a/extra/yassl/taocrypt/Makefile.in b/extra/yassl/taocrypt/Makefile.in
--- a/extra/yassl/taocrypt/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/extra/yassl/taocrypt/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -142,6 +142,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba extra/yassl/taocrypt/benchmark/Makefile.in
+diff -ruN a/extra/yassl/taocrypt/benchmark/Makefile.in b/extra/yassl/taocrypt/benchmark/Makefile.in
--- a/extra/yassl/taocrypt/benchmark/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/extra/yassl/taocrypt/benchmark/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -153,6 +153,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba extra/yassl/taocrypt/src/Makefile.in
+diff -ruN a/extra/yassl/taocrypt/src/Makefile.in b/extra/yassl/taocrypt/src/Makefile.in
--- a/extra/yassl/taocrypt/src/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/extra/yassl/taocrypt/src/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -164,6 +164,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba extra/yassl/taocrypt/test/Makefile.in
+diff -ruN a/extra/yassl/taocrypt/test/Makefile.in b/extra/yassl/taocrypt/test/Makefile.in
--- a/extra/yassl/taocrypt/test/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/extra/yassl/taocrypt/test/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -153,6 +153,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba extra/yassl/testsuite/Makefile.in
+diff -ruN a/extra/yassl/testsuite/Makefile.in b/extra/yassl/testsuite/Makefile.in
--- a/extra/yassl/testsuite/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/extra/yassl/testsuite/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -156,6 +156,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba heap/Makefile.in
+diff -ruN a/heap/Makefile.in b/heap/Makefile.in
--- a/heap/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/heap/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -202,6 +202,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba include/Makefile.in
+diff -ruN a/include/Makefile.in b/include/Makefile.in
--- a/include/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/include/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -160,6 +160,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba include/mysql_com.h
+diff -ruN a/include/mysql_com.h b/include/mysql_com.h
--- a/include/mysql_com.h Wed Jul 29 13:33:34 2009 -0700
+++ b/include/mysql_com.h Wed Jul 29 13:34:11 2009 -0700
@@ -25,6 +25,7 @@
/* The following can't be set with mysql_refresh() */
#define REFRESH_READ_LOCK 16384 /* Lock tables for read */
-diff -r 592f6c3641ba libmysql/Makefile.in
+@@ -219,7 +225,7 @@
+
+ my_bool report_error; /* We should report error (we have unreported error) */
+ my_bool return_errno;
+-#if defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY)
++#if defined(MYSQL_SERVER)
+ /*
+ Controls whether a big packet should be skipped.
+
+diff -ruN a/libmysql/Makefile.in b/libmysql/Makefile.in
--- a/libmysql/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/libmysql/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -224,6 +224,7 @@
LIBS = @CLIENT_LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba libmysql_r/Makefile.in
+diff -ruN a/libmysql_r/Makefile.in b/libmysql_r/Makefile.in
--- a/libmysql_r/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/libmysql_r/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -221,6 +221,7 @@
LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba libmysqld/Makefile.in
+diff -ruN a/libmysqld/Makefile.in b/libmysqld/Makefile.in
--- a/libmysqld/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/libmysqld/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -246,6 +246,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba libmysqld/examples/Makefile.in
+diff -ruN a/libmysqld/examples/Makefile.in b/libmysqld/examples/Makefile.in
--- a/libmysqld/examples/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/libmysqld/examples/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -192,6 +192,7 @@
LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba man/Makefile.in
+diff -ruN a/man/Makefile.in b/man/Makefile.in
--- a/man/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/man/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -151,6 +151,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba myisam/Makefile.in
+diff -ruN a/myisam/Makefile.in b/myisam/Makefile.in
--- a/myisam/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/myisam/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -235,6 +235,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba myisammrg/Makefile.in
+diff -ruN a/myisammrg/Makefile.in b/myisammrg/Makefile.in
--- a/myisammrg/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/myisammrg/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -183,6 +183,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba mysql-test/Makefile.in
+diff -ruN a/mysql-test/Makefile.in b/mysql-test/Makefile.in
--- a/mysql-test/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/mysql-test/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -161,6 +161,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba mysql-test/ndb/Makefile.in
+diff -ruN a/mysql-test/ndb/Makefile.in b/mysql-test/ndb/Makefile.in
--- a/mysql-test/ndb/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/mysql-test/ndb/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -147,6 +147,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba mysql-test/r/information_schema.result
+diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
--- a/mysql-test/r/information_schema.result Wed Jul 29 13:33:34 2009 -0700
+++ b/mysql-test/r/information_schema.result Wed Jul 29 13:34:11 2009 -0700
@@ -37,10 +37,12 @@
VIEWS information_schema.VIEWS 1
create table t1(f1 int);
create view v1 as select f1+1 as a from t1;
-diff -r 592f6c3641ba mysql-test/r/information_schema_db.result
+diff -ruN a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result
--- a/mysql-test/r/information_schema_db.result Wed Jul 29 13:33:34 2009 -0700
+++ b/mysql-test/r/information_schema_db.result Wed Jul 29 13:34:11 2009 -0700
@@ -6,10 +6,12 @@
TRIGGERS
create database `inf%`;
create database mbase;
-diff -r 592f6c3641ba mysql-test/r/mysqlshow.result
+diff -ruN a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result
--- a/mysql-test/r/mysqlshow.result Wed Jul 29 13:33:34 2009 -0700
+++ b/mysql-test/r/mysqlshow.result Wed Jul 29 13:34:11 2009 -0700
@@ -80,10 +80,12 @@
| VIEWS |
+---------------------------------------+
Wildcard: inf_rmation_schema
-diff -r 592f6c3641ba mysys/Makefile.in
+diff -ruN a/mysys/Makefile.in b/mysys/Makefile.in
--- a/mysys/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/mysys/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -228,6 +228,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/Makefile.in
+diff -ruN a/ndb/Makefile.in b/ndb/Makefile.in
--- a/ndb/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -171,6 +171,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/docs/Makefile.in
+diff -ruN a/ndb/docs/Makefile.in b/ndb/docs/Makefile.in
--- a/ndb/docs/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/docs/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -149,6 +149,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/include/Makefile.in
+diff -ruN a/ndb/include/Makefile.in b/ndb/include/Makefile.in
--- a/ndb/include/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/include/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -179,6 +179,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/Makefile.in
+diff -ruN a/ndb/src/Makefile.in b/ndb/src/Makefile.in
--- a/ndb/src/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -204,6 +204,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/common/Makefile.in
+diff -ruN a/ndb/src/common/Makefile.in b/ndb/src/common/Makefile.in
--- a/ndb/src/common/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/common/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -174,6 +174,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/common/debugger/Makefile.in
+diff -ruN a/ndb/src/common/debugger/Makefile.in b/ndb/src/common/debugger/Makefile.in
--- a/ndb/src/common/debugger/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/common/debugger/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -206,6 +206,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/common/debugger/signaldata/Makefile.in
+diff -ruN a/ndb/src/common/debugger/signaldata/Makefile.in b/ndb/src/common/debugger/signaldata/Makefile.in
--- a/ndb/src/common/debugger/signaldata/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/common/debugger/signaldata/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -211,6 +211,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/common/logger/Makefile.in
+diff -ruN a/ndb/src/common/logger/Makefile.in b/ndb/src/common/logger/Makefile.in
--- a/ndb/src/common/logger/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/common/logger/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -197,6 +197,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/common/mgmcommon/Makefile.in
+diff -ruN a/ndb/src/common/mgmcommon/Makefile.in b/ndb/src/common/mgmcommon/Makefile.in
--- a/ndb/src/common/mgmcommon/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/common/mgmcommon/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -211,6 +211,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/common/portlib/Makefile.in
+diff -ruN a/ndb/src/common/portlib/Makefile.in b/ndb/src/common/portlib/Makefile.in
--- a/ndb/src/common/portlib/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/common/portlib/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -222,6 +222,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/common/transporter/Makefile.in
+diff -ruN a/ndb/src/common/transporter/Makefile.in b/ndb/src/common/transporter/Makefile.in
--- a/ndb/src/common/transporter/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/common/transporter/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -197,6 +197,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/common/util/Makefile.in
+diff -ruN a/ndb/src/common/util/Makefile.in b/ndb/src/common/util/Makefile.in
--- a/ndb/src/common/util/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/common/util/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -217,6 +217,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/cw/Makefile.in
+diff -ruN a/ndb/src/cw/Makefile.in b/ndb/src/cw/Makefile.in
--- a/ndb/src/cw/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/cw/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -156,6 +156,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/cw/cpcd/Makefile.in
+diff -ruN a/ndb/src/cw/cpcd/Makefile.in b/ndb/src/cw/cpcd/Makefile.in
--- a/ndb/src/cw/cpcd/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/cw/cpcd/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -207,6 +207,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/Makefile.in
+diff -ruN a/ndb/src/kernel/Makefile.in b/ndb/src/kernel/Makefile.in
--- a/ndb/src/kernel/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -227,6 +227,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/Makefile.in b/ndb/src/kernel/blocks/Makefile.in
--- a/ndb/src/kernel/blocks/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -156,6 +156,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/backup/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/backup/Makefile.in b/ndb/src/kernel/blocks/backup/Makefile.in
--- a/ndb/src/kernel/blocks/backup/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/backup/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -196,6 +196,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/cmvmi/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/cmvmi/Makefile.in b/ndb/src/kernel/blocks/cmvmi/Makefile.in
--- a/ndb/src/kernel/blocks/cmvmi/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/cmvmi/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -196,6 +196,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/dbacc/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/dbacc/Makefile.in b/ndb/src/kernel/blocks/dbacc/Makefile.in
--- a/ndb/src/kernel/blocks/dbacc/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/dbacc/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -196,6 +196,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/dbdict/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/dbdict/Makefile.in b/ndb/src/kernel/blocks/dbdict/Makefile.in
--- a/ndb/src/kernel/blocks/dbdict/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/dbdict/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -206,6 +206,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/dbdih/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/dbdih/Makefile.in b/ndb/src/kernel/blocks/dbdih/Makefile.in
--- a/ndb/src/kernel/blocks/dbdih/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/dbdih/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -203,6 +203,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/dblqh/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/dblqh/Makefile.in b/ndb/src/kernel/blocks/dblqh/Makefile.in
--- a/ndb/src/kernel/blocks/dblqh/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/dblqh/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -204,6 +204,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/dbtc/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/dbtc/Makefile.in b/ndb/src/kernel/blocks/dbtc/Makefile.in
--- a/ndb/src/kernel/blocks/dbtc/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/dbtc/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -196,6 +196,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/dbtup/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/dbtup/Makefile.in b/ndb/src/kernel/blocks/dbtup/Makefile.in
--- a/ndb/src/kernel/blocks/dbtup/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/dbtup/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -204,6 +204,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/dbtux/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/dbtux/Makefile.in b/ndb/src/kernel/blocks/dbtux/Makefile.in
--- a/ndb/src/kernel/blocks/dbtux/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/dbtux/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -199,6 +199,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/dbutil/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/dbutil/Makefile.in b/ndb/src/kernel/blocks/dbutil/Makefile.in
--- a/ndb/src/kernel/blocks/dbutil/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/dbutil/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -196,6 +196,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/ndbcntr/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/ndbcntr/Makefile.in b/ndb/src/kernel/blocks/ndbcntr/Makefile.in
--- a/ndb/src/kernel/blocks/ndbcntr/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/ndbcntr/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -197,6 +197,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/ndbfs/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/ndbfs/Makefile.in b/ndb/src/kernel/blocks/ndbfs/Makefile.in
--- a/ndb/src/kernel/blocks/ndbfs/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/ndbfs/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -197,6 +197,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/qmgr/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/qmgr/Makefile.in b/ndb/src/kernel/blocks/qmgr/Makefile.in
--- a/ndb/src/kernel/blocks/qmgr/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/qmgr/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -196,6 +196,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/suma/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/suma/Makefile.in b/ndb/src/kernel/blocks/suma/Makefile.in
--- a/ndb/src/kernel/blocks/suma/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/suma/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -196,6 +196,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/trix/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/trix/Makefile.in b/ndb/src/kernel/blocks/trix/Makefile.in
--- a/ndb/src/kernel/blocks/trix/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/trix/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -196,6 +196,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/error/Makefile.in
+diff -ruN a/ndb/src/kernel/error/Makefile.in b/ndb/src/kernel/error/Makefile.in
--- a/ndb/src/kernel/error/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/error/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -206,6 +206,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/vm/Makefile.in
+diff -ruN a/ndb/src/kernel/vm/Makefile.in b/ndb/src/kernel/vm/Makefile.in
--- a/ndb/src/kernel/vm/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/vm/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -207,6 +207,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/mgmapi/Makefile.in
+diff -ruN a/ndb/src/mgmapi/Makefile.in b/ndb/src/mgmapi/Makefile.in
--- a/ndb/src/mgmapi/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/mgmapi/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -205,6 +205,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/mgmclient/Makefile.in
+diff -ruN a/ndb/src/mgmclient/Makefile.in b/ndb/src/mgmclient/Makefile.in
--- a/ndb/src/mgmclient/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/mgmclient/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -216,6 +216,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/mgmsrv/Makefile.in
+diff -ruN a/ndb/src/mgmsrv/Makefile.in b/ndb/src/mgmsrv/Makefile.in
--- a/ndb/src/mgmsrv/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/mgmsrv/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -213,6 +213,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/ndbapi/Makefile.in
+diff -ruN a/ndb/src/ndbapi/Makefile.in b/ndb/src/ndbapi/Makefile.in
--- a/ndb/src/ndbapi/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/ndbapi/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -215,6 +215,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/test/Makefile.in
+diff -ruN a/ndb/test/Makefile.in b/ndb/test/Makefile.in
--- a/ndb/test/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/test/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -156,6 +156,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/test/ndbapi/Makefile.in
+diff -ruN a/ndb/test/ndbapi/Makefile.in b/ndb/test/ndbapi/Makefile.in
--- a/ndb/test/ndbapi/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/test/ndbapi/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -595,6 +595,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/test/ndbapi/bank/Makefile.in
+diff -ruN a/ndb/test/ndbapi/bank/Makefile.in b/ndb/test/ndbapi/bank/Makefile.in
--- a/ndb/test/ndbapi/bank/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/test/ndbapi/bank/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -282,6 +282,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/test/run-test/Makefile.in
+diff -ruN a/ndb/test/run-test/Makefile.in b/ndb/test/run-test/Makefile.in
--- a/ndb/test/run-test/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/test/run-test/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -243,6 +243,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/test/src/Makefile.in
+diff -ruN a/ndb/test/src/Makefile.in b/ndb/test/src/Makefile.in
--- a/ndb/test/src/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/test/src/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -213,6 +213,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/test/tools/Makefile.in
+diff -ruN a/ndb/test/tools/Makefile.in b/ndb/test/tools/Makefile.in
--- a/ndb/test/tools/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/test/tools/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -325,6 +325,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/tools/Makefile.in
+diff -ruN a/ndb/tools/Makefile.in b/ndb/tools/Makefile.in
--- a/ndb/tools/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/tools/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -344,6 +344,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba netware/Makefile.in
+diff -ruN a/netware/Makefile.in b/netware/Makefile.in
--- a/netware/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/netware/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -199,6 +199,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba os2/Makefile.in
---- a/os2/Makefile.in Wed Jul 29 13:33:34 2009 -0700
-+++ b/os2/Makefile.in Wed Jul 29 13:34:11 2009 -0700
-@@ -156,6 +156,7 @@
- LIBDL = @LIBDL@
- LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
- LIBOBJS = @LIBOBJS@
-+LIBRT = @LIBRT@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba os2/include/Makefile.in
---- a/os2/include/Makefile.in Wed Jul 29 13:33:34 2009 -0700
-+++ b/os2/include/Makefile.in Wed Jul 29 13:34:11 2009 -0700
-@@ -156,6 +156,7 @@
- LIBDL = @LIBDL@
- LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
- LIBOBJS = @LIBOBJS@
-+LIBRT = @LIBRT@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba os2/include/sys/Makefile.in
---- a/os2/include/sys/Makefile.in Wed Jul 29 13:33:34 2009 -0700
-+++ b/os2/include/sys/Makefile.in Wed Jul 29 13:34:11 2009 -0700
-@@ -144,6 +144,7 @@
- LIBDL = @LIBDL@
- LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
- LIBOBJS = @LIBOBJS@
-+LIBRT = @LIBRT@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba patch_info/userstats.info
+diff -ruN /dev/null b/patch_info/userstats.info
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patch_info/userstats.info Wed Jul 29 13:34:11 2009 -0700
@@ -0,0 +1,14 @@
+
+2008-12-09
+YK: fixed "Row_sent: 0" problem at microslow_innodb.patch
-diff -r 592f6c3641ba pstack/Makefile.in
+diff -ruN a/pstack/Makefile.in b/pstack/Makefile.in
--- a/pstack/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/pstack/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -196,6 +196,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba pstack/aout/Makefile.in
+diff -ruN a/pstack/aout/Makefile.in b/pstack/aout/Makefile.in
--- a/pstack/aout/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/pstack/aout/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -134,6 +134,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba regex/Makefile.in
+diff -ruN a/regex/Makefile.in b/regex/Makefile.in
--- a/regex/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/regex/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -180,6 +180,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba scripts/Makefile.in
+diff -ruN a/scripts/Makefile.in b/scripts/Makefile.in
--- a/scripts/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/scripts/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -176,6 +176,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba server-tools/Makefile.in
+diff -ruN a/server-tools/Makefile.in b/server-tools/Makefile.in
--- a/server-tools/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/server-tools/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -155,6 +155,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba server-tools/instance-manager/Makefile.in
+diff -ruN a/server-tools/instance-manager/Makefile.in b/server-tools/instance-manager/Makefile.in
--- a/server-tools/instance-manager/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/server-tools/instance-manager/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -205,6 +205,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba sql/Makefile.in
+diff -ruN a/sql/Makefile.in b/sql/Makefile.in
--- a/sql/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -274,6 +274,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba sql/ha_innodb.cc
+diff -ruN a/sql/ha_innodb.cc b/sql/ha_innodb.cc
--- a/sql/ha_innodb.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/ha_innodb.cc Wed Jul 29 13:34:11 2009 -0700
-@@ -3341,6 +3341,8 @@
+@@ -3329,6 +3329,8 @@
error = row_insert_for_mysql((byte*) record, prebuilt);
if (error == DB_SUCCESS && auto_inc_used) {
/* Fetch the value that was set in the autoincrement field */
-@@ -3613,6 +3615,8 @@
+@@ -3601,6 +3603,8 @@
}
}
innodb_srv_conc_exit_innodb(prebuilt->trx);
error = convert_error_code_to_mysql(error, user_thd);
-@@ -3661,6 +3665,8 @@
+@@ -3649,6 +3653,8 @@
error = row_update_for_mysql((byte*) record, prebuilt);
innodb_srv_conc_exit_innodb(prebuilt->trx);
error = convert_error_code_to_mysql(error, user_thd);
-@@ -4092,6 +4098,9 @@
+@@ -4080,6 +4086,9 @@
if (ret == DB_SUCCESS) {
error = 0;
table->status = 0;
} else if (ret == DB_RECORD_NOT_FOUND) {
error = HA_ERR_END_OF_FILE;
-diff -r 592f6c3641ba sql/ha_myisam.cc
+diff -ruN a/sql/ha_myisam.cc b/sql/ha_myisam.cc
--- a/sql/ha_myisam.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/ha_myisam.cc Wed Jul 29 13:34:11 2009 -0700
@@ -670,7 +670,9 @@
}
int ha_myisam::check(THD* thd, HA_CHECK_OPT* check_opt)
-@@ -1521,13 +1523,17 @@
+@@ -1516,13 +1518,17 @@
statistic_increment(table->in_use->status_var.ha_update_count,&LOCK_status);
if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE)
table->timestamp_field->set_time();
}
int ha_myisam::index_read(byte * buf, const byte * key,
-@@ -1538,6 +1544,13 @@
+@@ -1533,6 +1539,13 @@
&LOCK_status);
int error=mi_rkey(file,buf,active_index, key, key_len, find_flag);
table->status=error ? STATUS_NOT_FOUND: 0;
return error;
}
-@@ -1548,6 +1561,13 @@
+@@ -1543,6 +1556,13 @@
&LOCK_status);
int error=mi_rkey(file,buf,index, key, key_len, find_flag);
table->status=error ? STATUS_NOT_FOUND: 0;
return error;
}
-@@ -1558,6 +1578,13 @@
+@@ -1553,6 +1573,13 @@
&LOCK_status);
int error=mi_rkey(file,buf,active_index, key, key_len, HA_READ_PREFIX_LAST);
table->status=error ? STATUS_NOT_FOUND: 0;
return error;
}
-@@ -1568,6 +1595,13 @@
+@@ -1563,6 +1590,13 @@
&LOCK_status);
int error=mi_rnext(file,buf,active_index);
table->status=error ? STATUS_NOT_FOUND: 0;
return error;
}
-@@ -1578,6 +1612,13 @@
+@@ -1573,6 +1607,13 @@
&LOCK_status);
int error=mi_rprev(file,buf, active_index);
table->status=error ? STATUS_NOT_FOUND: 0;
return error;
}
-@@ -1588,6 +1629,13 @@
+@@ -1583,6 +1624,13 @@
&LOCK_status);
int error=mi_rfirst(file, buf, active_index);
table->status=error ? STATUS_NOT_FOUND: 0;
return error;
}
-@@ -1598,6 +1646,13 @@
+@@ -1593,6 +1641,13 @@
&LOCK_status);
int error=mi_rlast(file, buf, active_index);
table->status=error ? STATUS_NOT_FOUND: 0;
return error;
}
-@@ -1614,6 +1669,13 @@
+@@ -1609,6 +1664,13 @@
error= mi_rnext_same(file,buf);
} while (error == HA_ERR_RECORD_DELETED);
table->status=error ? STATUS_NOT_FOUND: 0;
return error;
}
-@@ -1631,6 +1693,7 @@
+@@ -1626,6 +1688,7 @@
&LOCK_status);
int error=mi_scan(file, buf);
table->status=error ? STATUS_NOT_FOUND: 0;
return error;
}
-@@ -1645,6 +1708,7 @@
+@@ -1640,6 +1703,7 @@
&LOCK_status);
int error=mi_rrnd(file, buf, my_get_ptr(pos,ref_length));
table->status=error ? STATUS_NOT_FOUND: 0;
return error;
}
-diff -r 592f6c3641ba sql/handler.cc
+diff -ruN a/sql/handler.cc b/sql/handler.cc
--- a/sql/handler.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/handler.cc Wed Jul 29 13:34:11 2009 -0700
-@@ -726,6 +726,8 @@
+@@ -727,6 +727,8 @@
if (cookie)
tc_log->unlog(cookie, xid);
DBUG_EXECUTE_IF("crash_commit_after", abort(););
end:
if (is_real_trans)
start_waiting_global_read_lock(thd);
-@@ -783,6 +785,7 @@
+@@ -784,6 +786,7 @@
thd->transaction.cleanup();
}
}
#endif /* USING_TRANSACTIONS */
DBUG_RETURN(error);
}
-@@ -1223,6 +1226,7 @@
+@@ -1224,6 +1227,7 @@
statistic_increment(thd->status_var.ha_rollback_count,&LOCK_status);
*ht=0; // keep it conveniently zero-filled
}
DBUG_RETURN(error);
}
-@@ -1453,6 +1457,8 @@
+@@ -1454,6 +1458,8 @@
else
dupp_ref=ref+ALIGN_SIZE(ref_length);
}
DBUG_RETURN(error);
}
-@@ -2287,6 +2293,111 @@
+@@ -2291,6 +2297,111 @@
return error;
}
/****************************************************************************
** Some general functions that isn't in the handler class
-diff -r 592f6c3641ba sql/handler.h
+diff -ruN a/sql/handler.h b/sql/handler.h
--- a/sql/handler.h Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/handler.h Wed Jul 29 13:34:11 2009 -0700
@@ -32,6 +32,10 @@
/*
default rename_table() and delete_table() rename/delete files with a
given name and extensions from bas_ext()
-diff -r 592f6c3641ba sql/lex.h
+diff -ruN a/sql/lex.h b/sql/lex.h
--- a/sql/lex.h Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/lex.h Wed Jul 29 13:34:11 2009 -0700
@@ -109,6 +109,7 @@
{ "USE_FRM", SYM(USE_FRM)},
{ "USING", SYM(USING)},
{ "UTC_DATE", SYM(UTC_DATE_SYM)},
-diff -r 592f6c3641ba sql/log.cc
+diff -ruN a/sql/log.cc b/sql/log.cc
--- a/sql/log.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/log.cc Wed Jul 29 13:34:11 2009 -0700
-@@ -1958,18 +1958,24 @@
+@@ -1960,18 +1960,24 @@
thd->current_insert_id);
if (e.write(file))
goto err;
}
if (thd->user_var_events.elements)
{
-@@ -1985,6 +1991,8 @@
+@@ -1987,6 +1993,8 @@
user_var_event->charset_number);
if (e.write(file))
goto err;
}
}
}
-@@ -1995,6 +2003,8 @@
+@@ -1997,6 +2005,8 @@
if (event_info->write(file))
goto err;
if (file == &log_file) // we are writing to the real log (disk)
{
-@@ -2117,6 +2127,7 @@
+@@ -2119,6 +2129,7 @@
*/
if (qinfo.write(&log_file))
goto err;
/* Read from the file used to cache the queries .*/
if (reinit_io_cache(cache, READ_CACHE, 0, 0, 0))
-@@ -2163,6 +2174,7 @@
+@@ -2165,6 +2176,7 @@
/* write the first half of the split header */
if (my_b_write(&log_file, header, carry))
goto err;
/*
copy fixed second half of header to cache so the correct
-@@ -2231,6 +2243,8 @@
+@@ -2233,6 +2245,8 @@
/* Write data to the binary log file */
if (my_b_write(&log_file, cache->read_pos, length))
goto err;
cache->read_pos=cache->read_end; // Mark buffer used up
DBUG_EXECUTE_IF("half_binlogged_transaction", goto DBUG_skip_commit;);
} while ((length=my_b_fill(cache)));
-@@ -2239,6 +2253,8 @@
+@@ -2241,6 +2255,8 @@
if (commit_event->write(&log_file))
goto err;
#ifndef DBUG_OFF
DBUG_skip_commit:
#endif
-diff -r 592f6c3641ba sql/mysql_priv.h
+diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h
--- a/sql/mysql_priv.h Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/mysql_priv.h Wed Jul 29 13:34:11 2009 -0700
@@ -837,7 +837,15 @@
extern const char *opt_date_time_formats[];
extern KNOWN_DATE_TIME_FORMAT known_date_time_formats[];
-diff -r 592f6c3641ba sql/mysqld.cc
+diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/mysqld.cc Wed Jul 29 13:34:11 2009 -0700
@@ -417,6 +417,7 @@
sp_cache_init();
/* Parameter for threads created for connections */
(void) pthread_attr_init(&connection_attrib);
-@@ -3428,6 +3446,10 @@
+@@ -3431,6 +3449,10 @@
sql_print_error("Out of memory");
unireg_abort(1);
}
if (ha_init())
{
sql_print_error("Can't init databases");
-@@ -3510,6 +3532,8 @@
+@@ -3513,6 +3535,8 @@
init_max_user_conn();
init_update_queries();
DBUG_RETURN(0);
}
-@@ -4236,6 +4260,7 @@
+@@ -4252,6 +4276,7 @@
{
DBUG_PRINT("error",("Too many connections"));
close_connection(thd, ER_CON_COUNT_ERROR, 1);
delete thd;
DBUG_VOID_RETURN;
}
-@@ -5056,6 +5081,7 @@
+@@ -5073,6 +5098,7 @@
OPT_PROFILING_USE_GETRUSAGE,
OPT_SLOW_LOG,
OPT_SLOW_QUERY_LOG_FILE,
OPT_USE_GLOBAL_LONG_QUERY_TIME,
OPT_INNODB_ROLLBACK_ON_TIMEOUT,
OPT_SECURE_FILE_PRIV,
-@@ -6523,6 +6549,10 @@
+@@ -6545,6 +6571,10 @@
(gptr*) &max_system_variables.net_wait_timeout, 0, GET_ULONG,
REQUIRED_ARG, NET_WAIT_TIMEOUT, 1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT),
0, 1, 0},
{0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
};
-diff -r 592f6c3641ba sql/set_var.cc
+diff -ruN a/sql/set_var.cc b/sql/set_var.cc
--- a/sql/set_var.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/set_var.cc Wed Jul 29 13:34:11 2009 -0700
-@@ -325,6 +325,7 @@
+@@ -326,6 +326,7 @@
sys_var_thd_ulong sys_read_buff_size("read_buffer_size",
&SV::read_buff_size);
sys_var_bool_ptr sys_readonly("read_only", &opt_readonly);
sys_var_thd_ulong sys_read_rnd_buff_size("read_rnd_buffer_size",
&SV::read_rnd_buff_size);
sys_var_thd_ulong sys_div_precincrement("div_precision_increment",
-@@ -837,6 +838,7 @@
+@@ -843,6 +844,7 @@
&sys_trans_alloc_block_size,
&sys_trans_prealloc_size,
&sys_tx_isolation,
&sys_version,
#ifdef HAVE_BERKELEY_DB
&sys_version_bdb,
-@@ -1190,6 +1192,7 @@
+@@ -1197,6 +1199,7 @@
{sys_tx_isolation.name, (char*) &sys_tx_isolation, SHOW_SYS},
{sys_updatable_views_with_limit.name,
(char*) &sys_updatable_views_with_limit,SHOW_SYS},
{sys_use_global_long_query_time.name, (char*) &sys_use_global_long_query_time, SHOW_SYS},
{sys_version.name, (char*) &sys_version, SHOW_SYS},
#ifdef HAVE_BERKELEY_DB
-diff -r 592f6c3641ba sql/share/Makefile.in
+diff -ruN a/sql/share/Makefile.in b/sql/share/Makefile.in
--- a/sql/share/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/share/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -144,6 +144,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba sql/sql_base.cc
+diff -ruN a/sql/sql_base.cc b/sql/sql_base.cc
--- a/sql/sql_base.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_base.cc Wed Jul 29 13:34:11 2009 -0700
@@ -624,6 +624,12 @@
db_type table_type=table->s->db_type;
strmov(path,table->s->path);
free_io_cache(table);
-diff -r 592f6c3641ba sql/sql_class.cc
+diff -ruN a/sql/sql_class.cc b/sql/sql_class.cc
--- a/sql/sql_class.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_class.cc Wed Jul 29 13:34:11 2009 -0700
@@ -239,6 +239,13 @@
}
-@@ -2108,6 +2226,7 @@
+@@ -2110,6 +2228,7 @@
if (likely(thd != 0))
{ /* current_thd==0 when close_connection() calls net_send_error() */
thd->status_var.bytes_sent+= length;
}
}
-@@ -2115,6 +2234,7 @@
+@@ -2117,6 +2236,7 @@
void thd_increment_bytes_received(ulong length)
{
current_thd->status_var.bytes_received+= length;
}
-diff -r 592f6c3641ba sql/sql_class.h
+diff -ruN a/sql/sql_class.h b/sql/sql_class.h
--- a/sql/sql_class.h Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_class.h Wed Jul 29 13:34:11 2009 -0700
-@@ -1302,6 +1302,8 @@
+@@ -1308,6 +1308,8 @@
first byte of the packet in do_command()
*/
enum enum_server_command command;
uint32 server_id;
uint32 file_id; // for LOAD DATA INFILE
/*
-@@ -1498,6 +1500,8 @@
+@@ -1504,6 +1506,8 @@
/* variables.transaction_isolation is reset to this after each commit */
enum_tx_isolation session_tx_isolation;
enum_check_fields count_cuted_fields;
DYNAMIC_ARRAY user_var_events; /* For user variables replication */
MEM_ROOT *user_var_events_alloc; /* Allocate above array elements here */
-@@ -1607,6 +1611,49 @@
+@@ -1613,6 +1617,49 @@
*/
LOG_INFO* current_linfo;
NET* slave_net; // network connection from slave -> m.
/* Used by the sys_var class to store temporary values */
union
{
-@@ -1662,6 +1709,11 @@
+@@ -1668,6 +1715,11 @@
alloc_root.
*/
void init_for_queries();
void change_user(void);
void cleanup(void);
void cleanup_after_query();
-@@ -1891,8 +1943,14 @@
+@@ -1901,8 +1953,14 @@
if (p_db_length)
*p_db_length= db_length;
return FALSE;
public:
/**
Add an internal error handler to the thread execution context.
-@@ -1935,6 +1993,10 @@
+@@ -1953,6 +2011,10 @@
MEM_ROOT main_mem_root;
};
#define tmp_disable_binlog(A) \
{ulonglong tmp_disable_binlog__save_options= (A)->options; \
-diff -r 592f6c3641ba sql/sql_delete.cc
+diff -ruN a/sql/sql_delete.cc b/sql/sql_delete.cc
--- a/sql/sql_delete.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_delete.cc Wed Jul 29 13:34:11 2009 -0700
-@@ -358,6 +358,7 @@
+@@ -366,6 +366,7 @@
send_ok(thd,deleted);
DBUG_PRINT("info",("%ld records deleted",(long) deleted));
}
DBUG_RETURN(error >= 0 || thd->net.report_error);
}
-@@ -887,6 +888,7 @@
+@@ -895,6 +896,7 @@
thd->row_count_func= deleted;
::send_ok(thd, deleted);
}
return 0;
}
-diff -r 592f6c3641ba sql/sql_insert.cc
+diff -ruN a/sql/sql_insert.cc b/sql/sql_insert.cc
--- a/sql/sql_insert.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_insert.cc Wed Jul 29 13:34:11 2009 -0700
-@@ -990,6 +990,7 @@
+@@ -999,6 +999,7 @@
thd->row_count_func= info.copied + info.deleted + updated;
::send_ok(thd, (ulong) thd->row_count_func, id, buff);
}
thd->abort_on_warning= 0;
DBUG_RETURN(FALSE);
-@@ -3094,6 +3095,7 @@
+@@ -3103,6 +3104,7 @@
autoinc_value_of_first_inserted_row : thd->insert_id_used ?
thd->last_insert_id : 0;
::send_ok(thd, (ulong) thd->row_count_func, id, buff);
DBUG_RETURN(0);
}
-diff -r 592f6c3641ba sql/sql_lex.h
+diff -ruN a/sql/sql_lex.h b/sql/sql_lex.h
--- a/sql/sql_lex.h Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_lex.h Wed Jul 29 13:34:11 2009 -0700
@@ -101,6 +101,9 @@
/* This should be the last !!! */
SQLCOM_END
};
-diff -r 592f6c3641ba sql/sql_parse.cc
---- a/sql/sql_parse.cc Wed Jul 29 13:33:34 2009 -0700
-+++ b/sql/sql_parse.cc Wed Jul 29 13:34:11 2009 -0700
+--- mysql-5.0.96/sql/sql_parse.cc~ 2012-05-08 23:53:39.000000000 +0300
++++ mysql-5.0.96/sql/sql_parse.cc 2012-05-09 00:06:42.467315321 +0300
@@ -78,6 +78,12 @@
const char *table_name);
static bool check_show_create_table_access(THD *thd, TABLE_LIST *table);
#ifdef __WIN__
extern void win_install_sigabrt_handler(void);
#endif
-@@ -504,6 +521,7 @@
+@@ -511,6 +528,7 @@
mysql_log.write(thd,COM_CONNECT,"%s",ER(ER_NOT_SUPPORTED_AUTH_MODE));
DBUG_RETURN(-1);
}
net_printf_error(thd, ER_ACCESS_DENIED_ERROR,
thd->main_security_ctx.user,
thd->main_security_ctx.host_or_ip,
-@@ -536,12 +554,190 @@
+@@ -543,13 +561,191 @@
void init_max_user_conn(void)
{
#ifndef NO_EMBEDDED_ACCESS_CHECKS
- 0,0,
- (hash_get_key) get_key_conn, (hash_free_key) free_user,
- 0);
--#endif
--}
+ if (hash_init(&hash_user_connections,system_charset_info,max_connections,
+ 0,0,
+ (hash_get_key) get_key_conn, (hash_free_key) free_user,
+ sql_print_error("Initializing hash_user_connections failed.");
+ exit(1);
+ }
-+#endif
-+}
-+
+ #endif
+ }
+
+byte *get_key_user_stats(USER_STATS *user_stats, uint *length,
+ my_bool not_used __attribute__((unused)))
+{
+ }
+}
+
-
++
/*
-@@ -599,7 +795,10 @@
+ check if user has already too many connections
+@@ -606,7 +802,10 @@
end:
if (error)
(void) pthread_mutex_unlock(&LOCK_user_conn);
DBUG_RETURN(error);
}
-@@ -646,6 +845,25 @@
+@@ -653,6 +852,25 @@
#endif /* NO_EMBEDDED_ACCESS_CHECKS */
}
/*
-@@ -698,6 +916,214 @@
+@@ -705,6 +923,214 @@
return uc_update_queries[command] != 0;
}
/*
Reset per-hour user resource limits when it has been more than
an hour since they were last checked
-@@ -1184,6 +1610,8 @@
+@@ -1190,6 +1616,8 @@
my_net_set_read_timeout(net, connect_timeout);
my_net_set_write_timeout(net, connect_timeout);
if ((error=check_connection(thd)))
{ // Wrong permissions
if (error > 0)
-@@ -1193,8 +1621,22 @@
+@@ -1199,8 +1627,22 @@
my_sleep(1000); /* must wait after eof() */
#endif
statistic_increment(aborted_connects,&LOCK_status);
#ifdef __NETWARE__
netware_reg_user(sctx->ip, sctx->user, "MySQL");
#endif
-@@ -1251,6 +1693,7 @@
+@@ -1257,6 +1699,7 @@
(net->vio && net->error && net->report_error))
{
statistic_increment(aborted_threads, &LOCK_status);
}
if (net->error && net->vio != 0 && net->report_error)
-@@ -1270,6 +1713,8 @@
+@@ -1276,6 +1719,8 @@
end_thread:
close_connection(thd, 0, 1);
end_thread(thd,1);
/*
If end_thread returns, we are either running with --one-thread
-@@ -1601,6 +2046,13 @@
+@@ -1606,6 +2051,13 @@
thd->clear_error(); // Clear error message
net_new_transaction(net);
packet_length= my_net_read(net);
-@@ -1759,6 +2211,9 @@
+@@ -1764,6 +2216,9 @@
}
thd->command=command;
/*
Commands which always take a long time are logged into
the slow log only if opt_log_slow_admin_statements is set.
-@@ -4539,6 +4994,15 @@
+@@ -4569,6 +5024,15 @@
if (check_global_access(thd,RELOAD_ACL))
goto error;
/*
reload_acl_and_cache() will tell us if we are allowed to write to the
binlog or not.
-@@ -4847,6 +5311,7 @@
+@@ -4877,6 +5341,7 @@
{
if (check_global_access(thd, SUPER_ACL))
{
my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), "SUPER");
goto create_sp_error;
}
-@@ -5691,6 +6156,7 @@
+@@ -5721,6 +6186,7 @@
if (!no_errors)
{
const char *db_name= db ? db : thd->db;
my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
sctx->priv_user, sctx->priv_host, db_name);
}
-@@ -5726,6 +6192,7 @@
+@@ -5756,6 +6222,7 @@
{ // We can never grant this
DBUG_PRINT("error",("No possible access"));
if (!no_errors)
my_error(ER_ACCESS_DENIED_ERROR, MYF(0),
sctx->priv_user,
sctx->priv_host,
-@@ -5758,11 +6225,15 @@
+@@ -5788,11 +6255,15 @@
DBUG_PRINT("error",("Access denied"));
if (!no_errors)
DBUG_RETURN(TRUE); /* purecov: tested */
#endif /* NO_EMBEDDED_ACCESS_CHECKS */
}
-@@ -5796,6 +6267,7 @@
+@@ -5826,6 +6297,7 @@
if ((thd->security_ctx->master_access & want_access))
return 0;
get_privilege_desc(command, sizeof(command), want_access);
my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), command);
return 1;
#endif /* NO_EMBEDDED_ACCESS_CHECKS */
-@@ -5828,6 +6300,7 @@
+@@ -5858,6 +6330,7 @@
if (!thd->col_access && check_grant_db(thd, dst_db_name))
{
my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
thd->security_ctx->priv_user,
thd->security_ctx->priv_host,
-@@ -5859,6 +6332,12 @@
+@@ -5889,6 +6362,12 @@
check_grant(thd, SELECT_ACL, dst_table, 2, UINT_MAX, FALSE);
}
case SCH_OPEN_TABLES:
case SCH_VARIABLES:
case SCH_STATUS:
-@@ -5912,8 +6391,8 @@
+@@ -5942,8 +6421,8 @@
#ifndef NO_EMBEDDED_ACCESS_CHECKS
TABLE_LIST *org_tables= tables;
#endif
-+ Security_context *sctx= thd->security_ctx, *backup_ctx= thd->security_ctx;
- TABLE_LIST *first_not_own_table= thd->lex->first_not_own_table();
-- Security_context *sctx= thd->security_ctx, *backup_ctx= thd->security_ctx;
+- TABLE_LIST *first_not_own_table= thd->lex->first_not_own_table();
+ Security_context *sctx= thd->security_ctx, *backup_ctx= thd->security_ctx;
++ TABLE_LIST *first_not_own_table= thd->lex->first_not_own_table();
/*
The check that first_not_own_table is not reached is for the case when
the given table list refers to the list for prelocking (contains tables
-@@ -5930,9 +6409,12 @@
+@@ -5960,9 +6439,12 @@
(want_access & ~(SELECT_ACL | EXTRA_ACL | FILE_ACL)))
{
if (!no_errors)
return TRUE;
}
/*
-@@ -6442,6 +6924,30 @@
+@@ -6993,6 +6993,31 @@
lex_start(thd);
mysql_reset_thd_for_next_command(thd);
+
+ if (opt_userstat_running) {
+#ifdef HAVE_CLOCK_GETTIME
-+ /* get start cputime */
++ /* get start cputime */
+ if (!(cputime_error = clock_gettime(CLOCK_THREAD_CPUTIME_ID, &tp)))
+ start_cpu_nsecs = tp.tv_sec*1000000000.0+tp.tv_nsec;
+#endif
+ }
+ }
+
- if (query_cache_send_result_to_client(thd, (char*) inBuf, length) <= 0)
++
+ if (query_cache_send_result_to_client(thd, rawbuf, length) <= 0)
{
LEX *lex= thd->lex;
-@@ -6520,6 +7026,43 @@
+@@ -6550,6 +7056,43 @@
*found_semicolon= NULL;
}
DBUG_VOID_RETURN;
}
-@@ -7531,8 +8074,35 @@
+@@ -7561,8 +8104,35 @@
pthread_mutex_unlock(&LOCK_active_mi);
}
#endif
*write_to_binlog= tmp_write_to_binlog;
return result;
}
-diff -r 592f6c3641ba sql/sql_prepare.cc
+diff -ruN a/sql/sql_prepare.cc b/sql/sql_prepare.cc
--- a/sql/sql_prepare.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_prepare.cc Wed Jul 29 13:34:11 2009 -0700
@@ -81,6 +81,9 @@
DBUG_VOID_RETURN;
}
-@@ -2281,8 +2346,32 @@
+@@ -2280,8 +2345,32 @@
/* First of all clear possible warnings from the previous command */
mysql_reset_thd_for_next_command(thd);
#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)
thd->profiling.set_query_source(stmt->query, stmt->query_length);
-@@ -2325,11 +2414,50 @@
+@@ -2324,11 +2413,50 @@
test(flags & (ulong) CURSOR_TYPE_READ_ONLY));
if (!(specialflag & SPECIAL_NO_PRIOR))
my_pthread_setprio(pthread_self(), WAIT_PRIOR);
DBUG_VOID_RETURN;
}
-@@ -2423,6 +2551,31 @@
+@@ -2422,6 +2550,31 @@
/* First of all clear possible warnings from the previous command */
mysql_reset_thd_for_next_command(thd);
statistic_increment(thd->status_var.com_stmt_fetch, &LOCK_status);
if (!(stmt= find_prepared_statement(thd, stmt_id, "mysql_stmt_fetch")))
DBUG_VOID_RETURN;
-@@ -2455,6 +2608,43 @@
+@@ -2454,6 +2607,43 @@
thd->restore_backup_statement(stmt, &stmt_backup);
thd->stmt_arena= thd;
DBUG_VOID_RETURN;
}
-@@ -2487,6 +2677,30 @@
+@@ -2486,6 +2676,30 @@
/* First of all clear possible warnings from the previous command */
mysql_reset_thd_for_next_command(thd);
statistic_increment(thd->status_var.com_stmt_reset, &LOCK_status);
if (!(stmt= find_prepared_statement(thd, stmt_id, "mysql_stmt_reset")))
DBUG_VOID_RETURN;
-@@ -2503,6 +2717,43 @@
+@@ -2502,6 +2716,43 @@
send_ok(thd);
DBUG_VOID_RETURN;
}
-diff -r 592f6c3641ba sql/sql_show.cc
---- a/sql/sql_show.cc Wed Jul 29 13:33:34 2009 -0700
-+++ b/sql/sql_show.cc Wed Jul 29 13:34:11 2009 -0700
+--- mysql-5.0.92/sql/sql_show.cc~ 2011-02-24 15:55:10.000000000 +0200
++++ mysql-5.0.92/sql/sql_show.cc 2011-02-24 15:56:28.993570019 +0200
@@ -540,6 +540,7 @@
sctx->master_access);
if (!(db_access & DB_ACLS) && (!grant_option || check_grant_db(thd,dbname)))
my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
sctx->priv_user, sctx->host_or_ip, dbname);
mysql_log.write(thd,COM_INIT_DB,ER(ER_DBACCESS_DENIED_ERROR),
-@@ -1890,6 +1891,300 @@
+@@ -1888,6 +1889,300 @@
DBUG_RETURN(FALSE);
}
/* collect status for all running threads */
-@@ -4500,6 +4795,77 @@
+@@ -4495,6 +4790,77 @@
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
};
/*
Description of ST_FIELD_INFO in table.h
-@@ -4509,6 +4875,8 @@
+@@ -4906,6 +4906,8 @@
{
- {"CHARACTER_SETS", charsets_fields_info, create_schema_table,
+ {"CHARACTER_SETS", charsets_fields_info, create_schema_table,
fill_schema_charsets, make_character_sets_old_format, 0, -1, -1, 0},
+ {"CLIENT_STATISTICS", client_stats_fields_info, create_schema_table,
+ fill_schema_client_stats, make_old_format, 0, -1, -1, 0},
- {"COLLATIONS", collation_fields_info, create_schema_table,
+ {"COLLATIONS", collation_fields_info, create_schema_table,
fill_schema_collation, make_old_format, 0, -1, -1, 0},
{"COLLATION_CHARACTER_SET_APPLICABILITY", coll_charset_app_fields_info,
-@@ -4517,6 +4885,8 @@
+@@ -4512,6 +4880,8 @@
get_all_tables, make_columns_old_format, get_schema_column_record, 1, 2, 0},
{"COLUMN_PRIVILEGES", column_privileges_fields_info, create_schema_table,
fill_schema_column_privileges, 0, 0, -1, -1, 0},
{"KEY_COLUMN_USAGE", key_column_usage_fields_info, create_schema_table,
get_all_tables, 0, get_schema_key_column_usage_record, 4, 5, 0},
{"OPEN_TABLES", open_tables_fields_info, create_schema_table,
-@@ -4542,10 +4912,14 @@
+@@ -4941,10 +4943,14 @@
get_all_tables, make_table_names_old_format, 0, 1, 2, 1},
{"TABLE_PRIVILEGES", table_privileges_fields_info, create_schema_table,
fill_schema_table_privileges, 0, 0, -1, -1, 0},
+ fill_schema_table_stats, make_old_format, 0, -1, -1, 0},
{"TRIGGERS", triggers_fields_info, create_schema_table,
get_all_tables, make_old_format, get_schema_triggers_record, 5, 6, 0},
- {"USER_PRIVILEGES", user_privileges_fields_info, create_schema_table,
+ {"USER_PRIVILEGES", user_privileges_fields_info, create_schema_table,
fill_schema_user_privileges, 0, 0, -1, -1, 0},
+ {"USER_STATISTICS", user_stats_fields_info, create_schema_table,
+ fill_schema_user_stats, make_old_format, 0, -1, -1, 0},
{"VARIABLES", variables_fields_info, create_schema_table, fill_variables,
make_old_format, 0, -1, -1, 1},
- {"VIEWS", view_fields_info, create_schema_table,
-diff -r 592f6c3641ba sql/sql_update.cc
+ {"VIEWS", view_fields_info, create_schema_table,
+diff -ruN a/sql/sql_update.cc b/sql/sql_update.cc
--- a/sql/sql_update.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_update.cc Wed Jul 29 13:34:11 2009 -0700
-@@ -601,7 +601,8 @@
+@@ -607,7 +607,8 @@
(thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated;
send_ok(thd, (ulong) thd->row_count_func,
thd->insert_id_used ? thd->last_insert_id : 0L,buff);
}
thd->count_cuted_fields= CHECK_FIELD_IGNORE; /* calc cuted fields */
thd->abort_on_warning= 0;
-@@ -1832,5 +1833,6 @@
+@@ -1838,5 +1839,6 @@
(thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated;
::send_ok(thd, (ulong) thd->row_count_func,
thd->insert_id_used ? thd->last_insert_id : 0L,buff);
+ thd->updated_row_count += thd->row_count_func;
return FALSE;
}
-diff -r 592f6c3641ba sql/sql_yacc.yy
+diff -ruN a/sql/sql_yacc.yy b/sql/sql_yacc.yy
--- a/sql/sql_yacc.yy Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_yacc.yy Wed Jul 29 13:34:11 2009 -0700
-@@ -523,6 +523,7 @@
+@@ -557,6 +557,7 @@
%token CHECK_SYM
%token CIPHER_SYM
%token CLIENT_SYM
%token CLOSE_SYM
%token COALESCE
%token CODE_SYM
-@@ -680,6 +681,7 @@
+@@ -714,6 +715,7 @@
%token IMPORT
%token INDEXES
%token INDEX_SYM
%token INFILE
%token INNER_SYM
%token INNOBASE_SYM
-@@ -909,6 +911,7 @@
+@@ -943,6 +945,7 @@
%token SIGNED_SYM
%token SIMPLE_SYM
%token SLAVE
%token SMALLINT
%token SNAPSHOT_SYM
%token SOUNDS_SYM
-@@ -949,6 +952,7 @@
+@@ -983,6 +986,7 @@
%token TABLES
%token TABLESPACE
%token TABLE_SYM
%token TEMPORARY
%token TEMPTABLE_SYM
%token TERMINATED
-@@ -991,6 +995,7 @@
+@@ -1025,6 +1029,7 @@
%token UPGRADE_SYM
%token USAGE
%token USER
%token USE_FRM
%token USE_SYM
%token USING
-@@ -8255,6 +8260,38 @@
+@@ -8285,6 +8290,38 @@
{
Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT;
}
| CREATE PROCEDURE sp_name
{
LEX *lex= Lex;
-@@ -8459,9 +8496,14 @@
+@@ -8485,9 +8522,14 @@
| LOGS_SYM { Lex->type|= REFRESH_LOG; }
| STATUS_SYM { Lex->type|= REFRESH_STATUS; }
| SLAVE { Lex->type|= REFRESH_SLAVE; }
opt_table_list:
/* empty */ {;}
-@@ -9450,6 +9492,7 @@
+@@ -9477,6 +9519,7 @@
| CHAIN_SYM {}
| CHANGED {}
| CIPHER_SYM {}
| CLIENT_SYM {}
| CODE_SYM {}
| COLLATION_SYM {}
-@@ -9502,6 +9545,7 @@
+@@ -9529,6 +9572,7 @@
| HOSTS_SYM {}
| HOUR_SYM {}
| IDENTIFIED_SYM {}
| INVOKER_SYM {}
| IMPORT {}
| INDEXES {}
-@@ -9611,6 +9655,7 @@
+@@ -9638,6 +9682,7 @@
| SIMPLE_SYM {}
| SHARE_SYM {}
| SHUTDOWN {}
| SNAPSHOT_SYM {}
| SOUNDS_SYM {}
| SOURCE_SYM {}
-@@ -9627,6 +9672,7 @@
+@@ -9654,6 +9699,7 @@
| SUSPEND_SYM {}
| SWAPS_SYM {}
| SWITCHES_SYM {}
| TABLES {}
| TABLESPACE {}
| TEMPORARY {}
-@@ -9647,6 +9693,7 @@
+@@ -9674,6 +9720,7 @@
| UNKNOWN_SYM {}
| UNTIL_SYM {}
| USER {}
| USE_FRM {}
| VARIABLES {}
| VIEW_SYM {}
-diff -r 592f6c3641ba sql/structs.h
+diff -ruN a/sql/structs.h b/sql/structs.h
--- a/sql/structs.h Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/structs.h Wed Jul 29 13:34:11 2009 -0700
-@@ -273,6 +273,98 @@
+@@ -279,6 +279,98 @@
time_t intime;
} USER_CONN;
/* Bits in form->update */
#define REG_MAKE_DUPP 1 /* Make a copy of record when read */
#define REG_NEW_RECORD 2 /* Write a new record if not found */
-diff -r 592f6c3641ba sql/table.h
+diff -ruN a/sql/table.h b/sql/table.h
--- a/sql/table.h Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/table.h Wed Jul 29 13:34:11 2009 -0700
@@ -371,10 +371,12 @@
SCH_VARIABLES,
SCH_VIEWS
};
-diff -r 592f6c3641ba strings/Makefile.in
+diff -ruN a/strings/Makefile.in b/strings/Makefile.in
--- a/strings/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/strings/Makefile.in Wed Jul 29 13:34:11 2009 -0700
-@@ -342,6 +342,7 @@
+@@ -344,6 +344,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba support-files/MacOSX/Makefile.in
+diff -ruN a/support-files/MacOSX/Makefile.in b/support-files/MacOSX/Makefile.in
--- a/support-files/MacOSX/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/support-files/MacOSX/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -148,6 +148,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba support-files/Makefile.in
+diff -ruN a/support-files/Makefile.in b/support-files/Makefile.in
--- a/support-files/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/support-files/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -171,6 +171,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba support-files/RHEL4-SElinux/Makefile.in
+diff -ruN a/support-files/RHEL4-SElinux/Makefile.in b/support-files/RHEL4-SElinux/Makefile.in
--- a/support-files/RHEL4-SElinux/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/support-files/RHEL4-SElinux/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -146,6 +146,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba tests/Makefile.in
+diff -ruN a/tests/Makefile.in b/tests/Makefile.in
--- a/tests/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/tests/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -193,6 +193,7 @@
LIBS = @CLIENT_LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba tools/Makefile.in
+diff -ruN a/tools/Makefile.in b/tools/Makefile.in
--- a/tools/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/tools/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -167,6 +167,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba vio/Makefile.in
+diff -ruN a/vio/Makefile.in b/vio/Makefile.in
--- a/vio/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/vio/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -176,6 +176,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba win/Makefile.in
+diff -ruN a/win/Makefile.in b/win/Makefile.in
--- a/win/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/win/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -144,6 +144,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba zlib/Makefile.in
+diff -ruN a/zlib/Makefile.in b/zlib/Makefile.in
--- a/zlib/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/zlib/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -187,6 +187,7 @@
LIBS = $(NON_THREADED_LIBS)
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -Nur a/include/mysql_com.h b/include/mysql_com.h
---- a/include/mysql_com.h 2010-05-22 00:26:45.000000000 -0700
-+++ b/include/mysql_com.h 2010-05-22 00:27:14.000000000 -0700
-@@ -228,7 +228,7 @@
-
- my_bool report_error; /* We should report error (we have unreported error) */
- my_bool return_errno;
--#if defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY)
-+#if defined(MYSQL_SERVER)
- /*
- Controls whether a big packet should be skipped.
-
projects / packages / mysql.git / blobdiff