sample about setting default storage engine

[packages/mysql.git] / log_connection_error.patch

diff --git a/log_connection_error.patch b/log_connection_error.patch
index 63224d1918905c9379f305827707650241d7a98e..0f6440a3066a609e6e8382d8a9479051956978ef 100644 (file)
--- a/log_connection_error.patch
+++ b/log_connection_error.patch
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/patch_info/log_connection_error.patch b/patch_info/log_connection_error.patch
---- a/patch_info/log_connection_error.patch    1970-01-01 03:00:00.000000000 +0300
-+++ b/patch_info/log_connection_error.patch    2010-07-28 16:47:47.634070367 +0400
+--- /dev/null
++++ b/patch_info/log_connection_error.patch
 @@ -0,0 +1,6 @@
 +File=log_connection_error.patch
 +Name=logging abandoned connections
@@ -15,10 +14,9 @@ diff -ruN a/patch_info/log_connection_error.patch b/patch_info/log_connection_er
 +Author=Percona <info@percona.com>
 +License=GPL
 +Comment=
-diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
---- a/sql/mysqld.cc    2010-07-28 16:47:47.105319218 +0400
-+++ b/sql/mysqld.cc    2010-07-28 16:47:47.644101813 +0400
-@@ -4990,6 +4990,10 @@
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
+@@ -4959,6 +4959,10 @@
  
      DBUG_PRINT("error",("Too many connections"));
      close_connection(thd, ER_CON_COUNT_ERROR);
@@ -29,7 +27,7 @@ diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
      delete thd;
      DBUG_VOID_RETURN;
    }
-@@ -5370,6 +5374,10 @@
+@@ -5342,6 +5346,10 @@
      if (!(thd->net.vio= vio_new_win32pipe(hConnectedPipe)) ||
        my_net_init(&thd->net, thd->net.vio))
      {
@@ -40,7 +38,7 @@ diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
        close_connection(thd, ER_OUT_OF_RESOURCES);
        delete thd;
        continue;
-@@ -5565,6 +5573,10 @@
+@@ -5537,6 +5545,10 @@
                                                     event_conn_closed)) ||
                          my_net_init(&thd->net, thd->net.vio))
      {
@@ -51,3 +49,83 @@ diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
        close_connection(thd, ER_OUT_OF_RESOURCES);
        errmsg= 0;
        goto errorconn;
+--- /dev/null
++++ b/mysql-test/r/percona_log_connection_error.result
+@@ -0,0 +1,16 @@
++SET @old_max_connections = @@max_connections;
++SET @old_log_warnings = @@log_warnings;
++SET GLOBAL max_connections=2;
++SET GLOBAL LOG_WARNINGS = 0;
++connect(localhost,root,,test,port,socket);
++ERROR HY000: Too many connections
++SET GLOBAL LOG_WARNINGS = 1;
++connect(localhost,root,,test,port,socket);
++ERROR HY000: Too many connections
++SET GLOBAL LOG_WARNINGS = 0;
++connect(localhost,root,,test,port,socket);
++ERROR HY000: Too many connections
++SET GLOBAL max_connections = @old_max_connections;
++SET GLOBAL log_warnings = @old_log_warnings;
++[log_grep.inc] file: percona.log_connection_error.err pattern: Too many connections
++[log_grep.inc] lines:   1
+--- /dev/null
++++ b/mysql-test/t/percona_log_connection_error-master.opt
+@@ -0,0 +1 @@
++--log-error
+--- /dev/null
++++ b/mysql-test/t/percona_log_connection_error.test
+@@ -0,0 +1,54 @@
++--source include/not_embedded.inc
++
++connect (main,localhost,root,,);
++connection main;
++SET @old_max_connections = @@max_connections;
++SET @old_log_warnings = @@log_warnings;
++SET GLOBAL max_connections=2;
++let $port=`SELECT Variable_value FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE Variable_name LIKE 'port'`;
++let $socket=`SELECT Variable_value FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE Variable_name LIKE 'socket'`;
++
++SET GLOBAL LOG_WARNINGS = 0;
++--connect (conn0,localhost,root,,)
++connection conn0;
++replace_result $port port $socket socket;
++--error 1040
++--connect(conn1,localhost,root,,)
++disconnect conn0;
++SLEEP 0.1; # tsarev: hack, but i don't know (and didn't find) how right
++
++connection main;
++SET GLOBAL LOG_WARNINGS = 1;
++--connect (conn1,localhost,root,,)
++replace_result $port port $socket socket;
++--error 1040
++--connect (conn0,localhost,root,,)
++disconnect conn1;
++SLEEP 0.1; # tsarev: hack, but i don't know (and didn't find) how right
++
++connection main;
++SET GLOBAL LOG_WARNINGS = 0;
++--connect (conn0,localhost,root,,)
++replace_result $port port $socket socket;
++--error 1040
++--connect(conn1,localhost,root,,)
++disconnect conn0;
++SLEEP 0.1; # tsarev: hack, but i don't know (and didn't find) how right
++
++connection main;
++SET GLOBAL max_connections = @old_max_connections;
++SET GLOBAL log_warnings = @old_log_warnings;
++let $log_error_= `SELECT @@GLOBAL.log_error`;
++if(!`select LENGTH('$log_error_')`)
++{
++  # MySQL Server on windows is started with --console and thus
++  # does not know the location of its .err log, use default location
++  let $log_error_ = $MYSQLTEST_VARDIR/log/mysqld.1.err;
++}
++
++--let log_error=$log_error_
++--let log_file=percona.log_connection_error.err
++--let log_file_full_path=$log_error
++--let grep_pattern= Too many connections
++--source include/log_grep.inc
++