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

[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.

=== modified file 'Percona-Server/sql/mysqld.cc'
--- Percona-Server/sql/mysqld.cc	2013-06-25 13:13:06 +0000
+++ Percona-Server/sql/mysqld.cc	2013-07-25 11:21:48 +0000
@@ -1488,6 +1488,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()
 {
@@ -5145,8 +5166,100 @@
 #define decrement_handler_count()
 #endif /* defined(_WIN32) || defined(HAVE_SMEM) */
 
-
+<<<<<<< TREE
+=======
 #ifndef EMBEDDED_LIBRARY
+#if defined(__linux__)
+/*
+ * Auto detect if we support flash cache on the host system.
+ * This needs to be called before we setuid away from root
+ * to avoid permission problems on opening the device node.
+ */
+static void init_cachedev(void)
+{
+  struct statfs stfs_data_home_dir;
+  struct statfs stfs;
+  struct mntent *ent;
+  pid_t pid = getpid();
+  FILE *mounts;
+  const char *error_message= NULL;
+
+  // disabled by default
+  cachedev_fd = -1;
+
+  if (!mysql_data_home)
+  {
+    error_message= "Flashcache setup error (mysql_data_home not set)";
+    goto epilogue;
+  }
+
+  if (statfs(mysql_data_home, &stfs_data_home_dir) < 0)
+  {
+    error_message= "Flashcache setup error (statfs)";
+    goto epilogue;
+  }
+
+  mounts = setmntent("/etc/mtab", "r");
+  if (mounts == NULL)
+  {
+    error_message= "Flashcache setup error (setmntent)";
+    goto epilogue;
+  }
+
+  while ((ent = getmntent(mounts)) != NULL)
+  {
+    if (statfs(ent->mnt_dir, &stfs) < 0)
+      continue;
+    if (memcmp(&stfs.f_fsid, &stfs_data_home_dir.f_fsid, sizeof(fsid_t)) == 0)
+      break;
+  }
+  endmntent(mounts);
+
+  if (ent == NULL)
+  {
+    error_message= "Flashcache setup error (getmntent loop)";
+    goto epilogue;
+  }
+
+  cachedev_fd = open(ent->mnt_fsname, O_RDONLY);
+  if (cachedev_fd < 0)
+  {
+    error_message= "Flashcache setup error (open flash device)";
+    goto epilogue;
+  }
+
+  /* cleanup previous whitelistings */
+  if (ioctl(cachedev_fd, FLASHCACHEDELALLWHITELIST, &pid) < 0)
+  {
+    close(cachedev_fd);
+    cachedev_fd = -1;
+    error_message= "Flashcache setup error (ioctl)";
+  } else {
+    ioctl(cachedev_fd, FLASHCACHEADDWHITELIST, &pid);
+  }
+
+epilogue:
+  if (error_message) {
+    sql_perror(error_message);
+    unireg_abort(1);
+  }
+  sql_print_information("Flashcache bypass support initialized successfully");
+
+}
+
+static void cleanup_cachedev(void)
+{
+  pid_t pid = getpid();
+
+  if (cachedev_enabled) {
+    ioctl(cachedev_fd, FLASHCACHEDELWHITELIST, &pid);
+    close(cachedev_fd);
+    cachedev_fd = -1;
+  }
+}
+#endif//__linux__
+>>>>>>> MERGE-SOURCE
+
 #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-25 13:13:06 +0000
+++ Percona-Server/sql/sql_connect.cc	2013-07-25 11:21:48 +0000
@@ -58,11 +58,14 @@
 #define MIN_HANDSHAKE_SIZE      6
 #endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */
 
+<<<<<<< TREE
 #ifndef EMBEDDED_LIBRARY
 // Increments connection count for user.
 static int increment_connection_count(THD* thd, bool use_lock);
 #endif
 
+=======
+>>>>>>> MERGE-SOURCE
 // 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);
 
@@ -83,6 +86,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'