Merge lp:~sergei.glushchenko/percona-server/55-disable-flashcache into lp:percona-server/5.5

[Sergei Glushchenko]

Merge fix from 5.1 series

[Sergei Glushchenko (sergei.glushchenko)]

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

[Alexey Kopytov (akopytov)]

review: Approve

=== added file 'Percona-Server/mysql-test/include/have_flashcache.inc'
--- Percona-Server/mysql-test/include/have_flashcache.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/have_flashcache.inc	2012-08-29 09:13:30 +0000
@@ -0,0 +1,7 @@
+# check if binary compiled with flashcache support
+
+-- require r/have_flashcache.require
+
+disable_query_log;
+show variables like 'have_flashcache';
+enable_query_log;

=== added file 'Percona-Server/mysql-test/r/have_flashcache.require'
--- Percona-Server/mysql-test/r/have_flashcache.require	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/have_flashcache.require	2012-08-29 09:13:30 +0000
@@ -0,0 +1,2 @@
+Variable_name	Value
+have_flashcache	YES

=== modified file 'Percona-Server/mysql-test/r/mysqld--help-notwin.result'
--- Percona-Server/mysql-test/r/mysqld--help-notwin.result	2012-08-07 06:10:00 +0000
+++ Percona-Server/mysql-test/r/mysqld--help-notwin.result	2012-08-29 09:13:30 +0000
@@ -154,6 +154,7 @@
  With this option enabled you can run myisamchk to test
  (not repair) tables while the MySQL server is running.
  Disable with --skip-external-locking.
+ --flashcache        Enable flashcache detection.
  --flush             Flush MyISAM tables to disk between SQL commands
  --flush-time=#      A dedicated thread is created to flush all tables at the
  given interval
@@ -855,6 +856,7 @@
 expand-fast-index-creation FALSE
 expire-logs-days 0
 external-locking FALSE
+flashcache FALSE
 flush FALSE
 flush-time 0
 ft-boolean-syntax + -><()~*:""&|

=== modified file 'Percona-Server/mysql-test/r/mysqld--help-win.result'
--- Percona-Server/mysql-test/r/mysqld--help-win.result	2012-08-07 06:10:00 +0000
+++ Percona-Server/mysql-test/r/mysqld--help-win.result	2012-08-29 09:13:30 +0000
@@ -154,6 +154,7 @@
  With this option enabled you can run myisamchk to test
  (not repair) tables while the MySQL server is running.
  Disable with --skip-external-locking.
+ --flashcache        Enable flashcache detection.
  --flush             Flush MyISAM tables to disk between SQL commands
  --flush-time=#      A dedicated thread is created to flush all tables at the
  given interval
@@ -806,6 +807,7 @@
 expand-fast-index-creation FALSE
 expire-logs-days 0
 external-locking FALSE
+flashcache FALSE
 flush FALSE
 flush-time 1800
 ft-boolean-syntax + -><()~*:""&|

=== added file 'Percona-Server/mysql-test/r/percona_bug747032.result'
--- Percona-Server/mysql-test/r/percona_bug747032.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_bug747032.result	2012-08-29 09:13:30 +0000
@@ -0,0 +1,1 @@
+Occurrences: 0

=== modified file 'Percona-Server/mysql-test/r/percona_server_variables_debug.result'
--- Percona-Server/mysql-test/r/percona_server_variables_debug.result	2012-08-09 06:49:56 +0000
+++ Percona-Server/mysql-test/r/percona_server_variables_debug.result	2012-08-29 09:13:30 +0000
@@ -61,6 +61,7 @@
 HAVE_CRYPT
 HAVE_CSV
 HAVE_DYNAMIC_LOADING
+HAVE_FLASHCACHE
 HAVE_GEOMETRY
 HAVE_INNODB
 HAVE_NDBCLUSTER

=== modified file 'Percona-Server/mysql-test/r/percona_server_variables_release.result'
--- Percona-Server/mysql-test/r/percona_server_variables_release.result	2012-08-07 06:10:00 +0000
+++ Percona-Server/mysql-test/r/percona_server_variables_release.result	2012-08-29 09:13:30 +0000
@@ -59,6 +59,7 @@
 HAVE_CRYPT
 HAVE_CSV
 HAVE_DYNAMIC_LOADING
+HAVE_FLASHCACHE
 HAVE_GEOMETRY
 HAVE_INNODB
 HAVE_NDBCLUSTER

=== added file 'Percona-Server/mysql-test/suite/sys_vars/r/have_flashcache_basic.result'
--- Percona-Server/mysql-test/suite/sys_vars/r/have_flashcache_basic.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/r/have_flashcache_basic.result	2012-08-29 09:13:30 +0000
@@ -0,0 +1,21 @@
+select @@global.have_flashcache="1";
+@@global.have_flashcache="1"
+0
+select @@session.have_flashcache;
+ERROR HY000: Variable 'have_flashcache' is a GLOBAL variable
+show global variables like 'have_flashcache';
+Variable_name	Value
+have_flashcache	#
+show session variables like 'have_flashcache';
+Variable_name	Value
+have_flashcache	#
+select * from information_schema.global_variables where variable_name='have_flashcache';
+VARIABLE_NAME	VARIABLE_VALUE
+HAVE_FLASHCACHE	#
+select * from information_schema.session_variables where variable_name='have_flashcache';
+VARIABLE_NAME	VARIABLE_VALUE
+HAVE_FLASHCACHE	#
+set global have_flashcache=1;
+ERROR HY000: Variable 'have_flashcache' is a read only variable
+set session have_flashcache=1;
+ERROR HY000: Variable 'have_flashcache' is a read only variable

=== added file 'Percona-Server/mysql-test/suite/sys_vars/t/have_flashcache_basic.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/have_flashcache_basic.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/have_flashcache_basic.test	2012-08-29 09:13:30 +0000
@@ -0,0 +1,23 @@
+#
+# only global
+#
+select @@global.have_flashcache="1";
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.have_flashcache;
+--replace_column 2 #
+show global variables like 'have_flashcache';
+--replace_column 2 #
+show session variables like 'have_flashcache';
+--replace_column 2 #
+select * from information_schema.global_variables where variable_name='have_flashcache';
+--replace_column 2 #
+select * from information_schema.session_variables where variable_name='have_flashcache';
+
+#
+# show that it's read-only
+#
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set global have_flashcache=1;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set session have_flashcache=1;
+

=== added file 'Percona-Server/mysql-test/t/percona_bug747032.test'
--- Percona-Server/mysql-test/t/percona_bug747032.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_bug747032.test	2012-08-29 09:13:30 +0000
@@ -0,0 +1,32 @@
+###################### percona_bug747032.test ########################
+# Bug #747032: Flashcache throws an error on startup when flashcache #
+#              is not used                                           #
+#                                                                    #
+# Test is designed to verify that --flashcache option work properly  #
+# to disable flashcache checks at startup                            #
+######################################################################
+
+--source include/not_embedded.inc
+--source include/have_flashcache.inc
+
+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;
+}
+# Assign env variable LOG_ERROR
+let LOG_ERROR=$log_error_;
+
+perl;
+  use strict;
+  my $log_error= $ENV{'LOG_ERROR'} or die "LOG_ERROR not set";
+  open(FILE, "$log_error") or die("Unable to open $log_error: $!\n");
+  my $count = grep(/Flashcache bypass support initialized successfully/g,<FILE>);
+  print "Occurrences: $count\n";
+  close(FILE);
+  # Clean error log file
+  open(FILE, '>', "$log_error");
+  close(FILE);
+EOF

=== modified file 'Percona-Server/sql/mysqld.cc'
--- Percona-Server/sql/mysqld.cc	2012-08-07 06:10:00 +0000
+++ Percona-Server/sql/mysqld.cc	2012-08-29 09:13:30 +0000
@@ -641,6 +641,7 @@
 SHOW_COMP_OPTION have_geometry, have_rtree_keys;
 SHOW_COMP_OPTION have_crypt, have_compress;
 SHOW_COMP_OPTION have_profiling;
+SHOW_COMP_OPTION have_flashcache;
 
 ulonglong opt_log_warnings_suppress= 0;
 
@@ -4294,24 +4295,23 @@
 
   // disabled by default
   cachedev_fd = -1;
-  cachedev_enabled= FALSE;
 
   if (!mysql_data_home)
   {
-    error_message= "mysql_data_home not set";
+    error_message= "Flashcache setup error (mysql_data_home not set)";
     goto epilogue;
   }
 
   if (statfs(mysql_data_home, &stfs_data_home_dir) < 0)
   {
-    error_message= "statfs failed";
+    error_message= "Flashcache setup error (statfs)";
     goto epilogue;
   }
 
   mounts = setmntent("/etc/mtab", "r");
   if (mounts == NULL)
   {
-    error_message= "setmntent failed";
+    error_message= "Flashcache setup error (setmntent)";
     goto epilogue;
   }
 
@@ -4326,14 +4326,14 @@
 
   if (ent == NULL)
   {
-    error_message= "getmntent loop failed";
+    error_message= "Flashcache setup error (getmntent loop)";
     goto epilogue;
   }
 
   cachedev_fd = open(ent->mnt_fsname, O_RDONLY);
   if (cachedev_fd < 0)
   {
-    error_message= "open flash device failed";
+    error_message= "Flashcache setup error (open flash device)";
     goto epilogue;
   }
 
@@ -4342,18 +4342,17 @@
   {
     close(cachedev_fd);
     cachedev_fd = -1;
-    error_message= "ioctl failed";
+    error_message= "Flashcache setup error (ioctl)";
   } else {
     ioctl(cachedev_fd, FLASHCACHEADDWHITELIST, &pid);
   }
 
 epilogue:
-  sql_print_information("Flashcache bypass: %s",
-      (cachedev_fd > 0) ? "enabled" : "disabled");
-  if (error_message)
-    sql_print_information("Flashcache setup error is : %s\n", error_message);
-  else
-    cachedev_enabled= TRUE;
+  if (error_message) {
+    sql_perror(error_message);
+    unireg_abort(1);
+  }
+  sql_print_information("Flashcache bypass support initialized successfully");
 
 }
 
@@ -4630,7 +4629,11 @@
 #endif
 
 #if defined(__linux__)
-  init_cachedev();
+  have_flashcache= SHOW_OPTION_YES;
+  if (cachedev_enabled)
+    init_cachedev();
+#else
+  have_flashcache= SHOW_OPTION_NO;
 #endif//__linux__
 
   /*
@@ -6288,6 +6291,12 @@
   {"table_cache", 0, "Deprecated; use --table-open-cache instead.",
    &table_cache_size, &table_cache_size, 0, GET_ULONG,
    REQUIRED_ARG, TABLE_OPEN_CACHE_DEFAULT, 1, 512*1024L, 0, 1, 0},
+  {"flashcache",
+   0,
+   "Enable flashcache detection.",
+   &cachedev_enabled,
+   &cachedev_enabled,
+   0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
   {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 

=== modified file 'Percona-Server/sql/set_var.h'
--- Percona-Server/sql/set_var.h	2012-08-07 18:49:16 +0000
+++ Percona-Server/sql/set_var.h	2012-08-29 09:13:30 +0000
@@ -306,6 +306,7 @@
 extern SHOW_COMP_OPTION have_geometry, have_rtree_keys;
 extern SHOW_COMP_OPTION have_crypt;
 extern SHOW_COMP_OPTION have_compress;
+extern SHOW_COMP_OPTION have_flashcache;
 
 /*
   Prototypes for helper functions

=== modified file 'Percona-Server/sql/sys_vars.cc'
--- Percona-Server/sql/sys_vars.cc	2012-08-07 06:10:00 +0000
+++ Percona-Server/sql/sys_vars.cc	2012-08-29 09:13:30 +0000
@@ -3055,6 +3055,10 @@
        "have_symlink", "have_symlink",
        READ_ONLY GLOBAL_VAR(have_symlink), NO_CMD_LINE);
 
+static Sys_var_have Sys_have_flashcache(
+       "have_flashcache", "have_flashcache",
+       READ_ONLY GLOBAL_VAR(have_flashcache), NO_CMD_LINE);
+
 static bool fix_log_state(sys_var *self, THD *thd, enum_var_type type);
 static Sys_var_mybool Sys_general_log(
        "general_log", "Log connections and queries to a table or log file. "