Merge lp:~sergei.glushchenko/percona-server/5.5-ps-bug1203567 into lp:percona-server/5.5

[Sergei Glushchenko]

Bug 1203567: close_socket() is not declared
The reason is missed close_socket from MariaDB in threadpool port.
Fixed by porting close_socket from MariaDB.
This branch also fixes few issues which prevent embedded server from
being able to be built. However this branch is still impossible to
compile with

CFLAGS="-USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -O0 -g3 -gdwarf-2" CXXFLAGS="-USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -O0 -g3 -gdwarf-2" cmake .. -DCMAKE_VERBOSE_MAKEFILE=true -DBUILD_CONFIG=mysql_release -DFEATURE_SET=community -DENABLE_DTRACE=OFF -DENABLE_DOWNLOADS=1 -DWITH_DEBUG=1

because embedded server is broken due to many undefined symbols such as
acl_is_utility_user, init_intvar_from_file, init_global_user_stats, etc.

http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param-valgrind/1/

I did not check test results because the bug was about impossibility of build.

[Sergei Glushchenko (sergei.glushchenko)]

Originally was proposed to incorrect branch

[George Ormond Lorch III (gl-az)]

Sergei, you seem to have two commits/revnos (545 and 546) with similar comments for this fix, shouldn't this just be a single commit?

review: Needs Fixing (g2)

[Sergei Glushchenko (sergei.glushchenko)]

Yes, George, I've done bzr uncommit and repushed branch.

[George Ormond Lorch III (gl-az)]

review: Approve (g2)

[Stewart Smith (stewart)]

I'm pretty sure we don't need the #ifdef NETWARE around, although if that's what upstream has, let's keep it.

review: Approve

=== modified file 'Percona-Server/sql/mysqld.cc'
--- Percona-Server/sql/mysqld.cc	2013-06-27 15:35:20 +0000
+++ Percona-Server/sql/mysqld.cc	2013-08-20 17:52:33 +0000
@@ -1238,6 +1238,27 @@
   DBUG_VOID_RETURN;
 }
 
+#ifdef HAVE_CLOSE_SERVER_SOCK
+static void close_socket(my_socket sock, const char *info)
+{
+  DBUG_ENTER("close_socket");
+
+  if (sock != INVALID_SOCKET)
+  {
+    DBUG_PRINT("info", ("calling shutdown on %s socket", info));
+    (void) mysql_socket_shutdown(sock, SHUT_RDWR);
+#if defined(__NETWARE__)
+    /*
+      The following code is disabled for normal systems as it causes MySQL
+      to hang on AIX 4.3 during shutdown
+    */
+    DBUG_PRINT("info", ("calling closesocket on %s socket", info));
+    (void) closesocket(tmp_sock);
+#endif
+  }
+  DBUG_VOID_RETURN;
+}
+#endif
 
 static void close_server_sock()
 {
@@ -4265,6 +4286,7 @@
 #define decrement_handler_count()
 #endif /* defined(_WIN32) || defined(HAVE_SMEM) */
 
+#ifndef EMBEDDED_LIBRARY
 #if defined(__linux__)
 /*
  * Auto detect if we support flash cache on the host system.
@@ -4355,7 +4377,6 @@
 }
 #endif//__linux__
 
-#ifndef EMBEDDED_LIBRARY
 #ifndef DBUG_OFF
 /*
   Debugging helper function to keep the locale database

=== modified file 'Percona-Server/sql/sql_connect.cc'
--- Percona-Server/sql/sql_connect.cc	2013-06-01 15:04:43 +0000
+++ Percona-Server/sql/sql_connect.cc	2013-08-20 17:52:33 +0000
@@ -56,9 +56,6 @@
 #define MIN_HANDSHAKE_SIZE      6
 #endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */
 
-// Increments connection count for user.
-static int increment_connection_count(THD* thd, bool use_lock);
-
 // Uses the THD to update the global stats by user name and client IP
 void update_global_user_stats(THD* thd, bool create_user, time_t now);
 
@@ -79,6 +76,10 @@
 */
 
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
+
+// Increments connection count for user.
+static int increment_connection_count(THD* thd, bool use_lock);
+
 static HASH hash_user_connections;
 
 int get_or_create_user_conn(THD *thd, const char *user,

=== modified file 'Percona-Server/sql/sys_vars.cc'
--- Percona-Server/sql/sys_vars.cc	2013-05-15 05:05:18 +0000
+++ Percona-Server/sql/sys_vars.cc	2013-08-20 17:52:33 +0000
@@ -2298,6 +2298,7 @@
        GLOBAL_VAR(thread_cache_size), CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(0, 16384), DEFAULT(0), BLOCK_SIZE(1));
 
+#ifdef HAVE_POOL_OF_THREADS
 
 static bool fix_tp_max_threads(sys_var *, THD *, enum_var_type)
 {
@@ -2332,7 +2333,6 @@
 }
 #endif
 
-#ifdef HAVE_POOL_OF_THREADS
 #ifdef _WIN32
 static Sys_var_uint Sys_threadpool_min_threads(
   "thread_pool_min_threads",