Merge lp:~ansharyan015/drizzle/logging_query_dynamic into lp:drizzle

[Daniel Nichter]

[Daniel Nichter (daniel-nichter)]

The new tests have hard-coded paths which fail:

logging_query.file [ fail ]
--- /home/vagrant/drizzle/stage/tests/../plugin/logging_query/tests/r/file.result 2012-07-10 02:00:27.845566000 +0300
+++ /home/vagrant/drizzle/stage/tests/../plugin/logging_query/tests/r/file.reject 2012-07-10 02:14:20.671982823 +0300
@@ -1,49 +1,49 @@
 Log file exists
-1 /home/ansh/repos/drizzle/logging_query_dynamic/tests/var/logging_query.log
+1 /home/vagrant/drizzle/stage/tests/var/logging_query.log
 SHOW VARIABLES LIKE "%logging_query%";
 Variable_name Value
 logging_query_enable OFF
-logging_query_filename /home/ansh/repos/drizzle/logging_query_dynamic/tests/var/logging_query.log
+logging_query_filename /home/vagrant/drizzle/stage/tests/var/logging_query.log
 logging_query_pcre
 logging_query_threshold_big_examined 0
 logging_query_threshold_big_resultset 0
 logging_query_threshold_slow 0
-1 /home/ansh/repos/drizzle/logging_query_dynamic/tests/var/logging_query.log
+1 /home/vagrant/drizzle/stage/tests/var/logging_query.log
 SET GLOBAL logging_query_enable=true;
 SELECT 1;
 1
 1
-3 /home/ansh/repos/drizzle/logging_query_dynamic/tests/var/logging_query.log
+3 /home/vagrant/drizzle/stage/tests/var/logging_query.log
 SET GLOBAL logging_query_pcre="SHOW.+";
 SELECT @@logging_query_enable;
 @@logging_query_enable
 1
-4 /home/ansh/repos/drizzle/logging_query_dynamic/tests/var/logging_query.log
+4 /home/vagrant/drizzle/stage/tests/var/logging_query.log
 SHOW VARIABLES LIKE "%logging_query%";
 Variable_name Value
 logging_query_enable ON
-logging_query_filename /home/ansh/repos/drizzle/logging_query_dynamic/tests/var/logging_query.log
+logging_query_filename /home/vagrant/drizzle/stage/tests/var/logging_query.log
 logging_query_pcre SHOW.+
 logging_query_threshold_big_examined 0
 logging_query_threshold_big_resultset 0
 logging_query_threshold_slow 0
-5 /home/ansh/repos/drizzle/logging_query_dynamic/tests/var/logging_query.log
+5 /home/vagrant/drizzle/stage/tests/var/logging_query.log
 SET GLOBAL logging_query_filename="DRIZZLETEST_VARDIR/logging_query1.log";
-1 /home/ansh/repos/drizzle/logging_query_dynamic/tests/var/logging_query1.log
+1 /home/vagrant/drizzle/stage/tests/var/logging_query1.log
 SELECT @@logging_query_enable;
 @@logging_query_enable
 1
-5 /home/ansh/repos/drizzle/logging_query_dynamic/tests/var/logging_query.log
-1 /home/ansh/repos/drizzle/logging_query_dynamic/tests/var/logging_query1.log
+5 /home/vagrant/drizzle/stage/tests/var/logging_query.log
+1 /home/vagrant/drizzle/stage/tests/var/logging_query1.log
 SHOW VARIABLES LIKE "%logging_query%";
 Variable_name Value
 logging_query_enable ON
-logging_query_filename /home/ansh/repos/drizzle/logging_query_dynamic/tests/var/logging_query1.log
+logging_query_filename /home/vagrant/drizzle/stage/tests/var/logging_query1.log
 logging_query_pcre SHOW.+
 logging_query_threshold_big_examined 0
 logging_query_threshold_big_resultset 0
 logging_query_threshold_slow 0
-5 /home/ansh/repos/drizzle/logging_query_dynamic/tests/var/logging_query.log
-2 /home/ansh/repos/drizzle/logging_query_dynamic/tests/var/logging_query1.log
+5 /home/vagrant/drizzle/stage/tests/var/logging_...

review: Needs Fixing (code review)

[Daniel Nichter (daniel-nichter)]

review: Approve (code review)

=== modified file 'plugin/logging_query/logging_query.cc'
--- plugin/logging_query/logging_query.cc	2012-01-16 02:37:54 +0000
+++ plugin/logging_query/logging_query.cc	2012-07-10 18:31:49 +0000
@@ -18,6 +18,7 @@
  */
 
 #include <config.h>
+#include <drizzled/item.h>
 #include <drizzled/plugin.h>
 #include <drizzled/plugin/logging.h>
 #include <drizzled/gettext.h>
@@ -44,8 +45,9 @@
 #define ESCAPE_CHAR      '\\'
 #define SEPARATOR_CHAR   ','
 
-namespace drizzle_plugin
-{
+namespace drizzle_plugin {
+namespace logging_query {
+
 
 static bool sysvar_logging_query_enable= false;
 /* TODO fix these to not be unsigned long once we have sensible sys_var system */
@@ -53,6 +55,10 @@
 static uint32_constraint sysvar_logging_query_threshold_big_resultset;
 static uint32_constraint sysvar_logging_query_threshold_big_examined;
 
+bool updateFileName(Session *, set_var*);
+bool updatePCRE(Session *, set_var*);
+
+
 /* quote a string to be safe to include in a CSV line
    that means backslash quoting all commas, doublequotes, backslashes,
    and all the ASCII unprintable characters
@@ -146,8 +152,8 @@
 
 class Logging_query: public drizzled::plugin::Logging
 {
-  const std::string _filename;
-  const std::string _query_pcre;
+  std::string sysvar_filename;
+  std::string sysvar_pcre;
   int fd;
   pcre *re;
   pcre_extra *pe;
@@ -160,37 +166,116 @@
   Logging_query(const std::string &filename,
                 const std::string &query_pcre) :
     drizzled::plugin::Logging("csv_query_log"),
-    _filename(filename),
-    _query_pcre(query_pcre),
+    sysvar_filename(filename),
+    sysvar_pcre(query_pcre),
     fd(-1), re(NULL), pe(NULL),
     formatter("%1%,%2%,%3%,\"%4%\",\"%5%\",\"%6%\",%7%,%8%,"
               "%9%,%10%,%11%,%12%,%13%,%14%,\"%15%\"\n")
   {
 
     /* if there is no destination filename, dont bother doing anything */
-    if (_filename.empty())
+    if (sysvar_filename.empty())
       return;
 
-    fd= open(_filename.c_str(),
+    fd= open(sysvar_filename.c_str(),
              O_WRONLY | O_APPEND | O_CREAT,
              S_IRUSR|S_IWUSR);
 
     if (fd < 0)
     {
-      sql_perror( _("fail open()"), _filename);
+      sql_perror( _("fail open()"), sysvar_filename);
       return;
     }
 
-    if (not _query_pcre.empty())
+    if (not sysvar_pcre.empty())
     {
       const char *this_pcre_error;
       int this_pcre_erroffset;
-      re= pcre_compile(_query_pcre.c_str(), 0, &this_pcre_error,
+      re= pcre_compile(sysvar_pcre.c_str(), 0, &this_pcre_error,
                        &this_pcre_erroffset, NULL);
       pe= pcre_study(re, 0, &this_pcre_error);
       /* TODO emit error messages if there is a problem */
     }
   }
+ 
+
+  /**
+   * This function changes the current query log file to the parameter passed to the function.
+   *
+   * @return True on success, False on error.
+   */
+  bool setFileName(std::string new_filename)
+  {
+    if (new_filename.empty())
+      return false;
+
+    int tmp_fd= open(new_filename.c_str(),
+                O_WRONLY | O_APPEND | O_CREAT,
+                S_IRUSR|S_IWUSR);
+
+    if (tmp_fd < 0)
+    {
+      sql_perror( _("fail open()"), new_filename);
+      return false;
+    }
+    if(fd >= 0)
+    {
+      close(fd);
+    }
+    fd= tmp_fd;
+    sysvar_filename= new_filename;
+    return true;
+  }
+
+  /**
+   * This function updates the current regex expression with the new regex expression passed as parameter.
+   *
+   * @return True on success, False on error.
+   */
+  bool setPCRE(std::string new_pcre)
+  {
+    if (not new_pcre.empty())
+    {
+      if (pe != NULL)
+      {
+        pcre_free(pe);
+      }
+
+      if (re != NULL)
+      {
+        pcre_free(re);
+      }
+
+      const char *tmp_this_pcre_error;
+      int tmp_this_pcre_erroffset;
+      re= pcre_compile(new_pcre.c_str(), 0, &tmp_this_pcre_error,
+                       &tmp_this_pcre_erroffset, NULL);
+      pe= pcre_study(re, 0, &tmp_this_pcre_error);
+      /* TODO emit error messages if there is a problem */
+    }
+    sysvar_pcre= new_pcre;
+    return true;
+  }
+ 
+  /**
+   * Getter for query log filename
+   *
+   * @return sysvar_filename
+   */
+  std::string& getFileName()
+  {
+    return sysvar_filename;
+  }
+
+  /**
+   * Getter for pcre
+   *
+   * @return sysvar_pcre
+   */
+  std::string& getPCRE()
+  {
+    return sysvar_pcre;
+  }
 
   ~Logging_query()
   {
@@ -295,17 +380,58 @@
   }
 };
 
-static int logging_query_plugin_init(drizzled::module::Context &context)
+static Logging_query *handler= NULL;
+
+/**
+ * This function is called when the value of logging_query_filename is updated dynamically.
+ *
+ * @return False on success, True on error.
+ */
+bool updateFileName(Session *, set_var* var)
+{
+  if (not var->value->str_value.empty())
+  {
+    std::string new_filename(var->value->str_value.data());
+    if (handler->setFileName(new_filename))
+      return false; //success
+    else
+      return true; // error
+  }
+  errmsg_printf(error::ERROR, _("logging_query_filename cannot be NULL"));
+  return true; // error
+}
+
+/**
+ * This function is called when the value of logging_query_pcre is updated dynamically.
+ *
+ * @return False on success, True on error.
+ */
+bool updatePCRE(Session *, set_var* var)
+{
+  if (not var->value->str_value.empty())
+  {
+    std::string new_pcre(var->value->str_value.data());
+    if (handler->setPCRE(new_pcre))
+      return false; //success
+    else
+      return true; // error
+  }
+  return false; // success
+}
+
+static int init(drizzled::module::Context &context)
 {
   const module::option_map &vm= context.getOptions();
 
   if (vm.count("filename"))
   {
-    context.add(new Logging_query(vm["filename"].as<string>(),
-                                  vm["pcre"].as<string>()));
+    handler= new Logging_query(vm["filename"].as<string>(),
+                                  vm["pcre"].as<string>());
+
+    context.add(handler);
     context.registerVariable(new sys_var_bool_ptr("enable", &sysvar_logging_query_enable));
-    context.registerVariable(new sys_var_const_string_val("filename", vm["filename"].as<string>()));
-    context.registerVariable(new sys_var_const_string_val("pcre", vm["pcre"].as<string>()));
+    context.registerVariable(new sys_var_std_string("filename", handler->getFileName(), NULL, &updateFileName));
+    context.registerVariable(new sys_var_std_string("pcre", handler->getPCRE(), NULL, &updatePCRE));
     context.registerVariable(new sys_var_constrained_value<uint32_t>("threshold_slow", sysvar_logging_query_threshold_slow));
     context.registerVariable(new sys_var_constrained_value<uint32_t>("threshold_big_resultset", sysvar_logging_query_threshold_big_resultset));
     context.registerVariable(new sys_var_constrained_value<uint32_t>("threshold_big_examined", sysvar_logging_query_threshold_big_examined));
@@ -336,6 +462,8 @@
           _("Threshold for logging big queries, for rows examined"));
 }
 
+} /* namespace logging_query */
+
 } /* namespace drizzle_plugin */
 
 DRIZZLE_DECLARE_PLUGIN
@@ -346,8 +474,8 @@
   "Mark Atwood",
   N_("Logs queries to a CSV file"),
   PLUGIN_LICENSE_GPL,
-  drizzle_plugin::logging_query_plugin_init,
+  drizzle_plugin::logging_query::init,
   NULL,
-  drizzle_plugin::init_options
+  drizzle_plugin::logging_query::init_options
 }
 DRIZZLE_DECLARE_PLUGIN_END;
 
=== added directory 'plugin/logging_query/tests'
=== added file 'plugin/logging_query/tests/parse-query-log.sh'
--- plugin/logging_query/tests/parse-query-log.sh	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/parse-query-log.sh	2012-07-10 18:31:49 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+wc -l "$1"|awk '{print($1)}'
 
=== added directory 'plugin/logging_query/tests/r'
=== added file 'plugin/logging_query/tests/r/file.result'
--- plugin/logging_query/tests/r/file.result	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/r/file.result	2012-07-10 18:31:49 +0000
@@ -0,0 +1,46 @@
+Log file exists
+1
+SHOW VARIABLES WHERE Variable_Name NOT LIKE "%logging_query_filename%" AND Variable_Name LIKE "%logging_query%";
+Variable_name	Value
+logging_query_enable	OFF
+logging_query_pcre	 
+logging_query_threshold_big_examined	0
+logging_query_threshold_big_resultset	0
+logging_query_threshold_slow	0
+1
+SET GLOBAL logging_query_enable=true;
+SELECT 1;
+1
+1
+3
+SET GLOBAL logging_query_pcre="SHOW.+";
+SELECT @@logging_query_enable;
+@@logging_query_enable
+1
+4
+SHOW VARIABLES WHERE Variable_Name NOT LIKE "%logging_query_filename%" AND Variable_Name LIKE "%logging_query%";
+Variable_name	Value
+logging_query_enable	ON
+logging_query_pcre	SHOW.+
+logging_query_threshold_big_examined	0
+logging_query_threshold_big_resultset	0
+logging_query_threshold_slow	0
+5
+SET GLOBAL logging_query_filename="DRIZZLETEST_VARDIR/logging_query1.log";
+1
+SELECT @@logging_query_enable;
+@@logging_query_enable
+1
+5
+1
+SHOW VARIABLES WHERE Variable_Name NOT LIKE "%logging_query_filename%" AND Variable_Name LIKE "%logging_query%";
+Variable_name	Value
+logging_query_enable	ON
+logging_query_pcre	SHOW.+
+logging_query_threshold_big_examined	0
+logging_query_threshold_big_resultset	0
+logging_query_threshold_slow	0
+5
+2
+SET GLOBAL logging_query_filename="";
+ERROR HY000: Incorrect arguments to SET
 
=== added file 'plugin/logging_query/tests/r/thresholds.result'
--- plugin/logging_query/tests/r/thresholds.result	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/r/thresholds.result	2012-07-10 18:31:49 +0000
@@ -0,0 +1,54 @@
+SET GLOBAL logging_query_filename="DRIZZLETEST_VARDIR/logging_query.log";
+SET GLOBAL logging_query_pcre=".+";
+SET GLOBAL logging_query_enable=true;
+SHOW VARIABLES LIKE 'logging_query_threshold%';
+Variable_name	Value
+logging_query_threshold_big_examined	0
+logging_query_threshold_big_resultset	0
+logging_query_threshold_slow	0
+SET GLOBAL logging_query_threshold_slow=500000;
+SELECT @@logging_query_threshold_slow;
+@@logging_query_threshold_slow
+500000
+
+SELECT SLEEP(0.4);
+SLEEP(0.4)
+0
+1
+SELECT SLEEP(0.5);
+SLEEP(0.5)
+0
+2
+SET GLOBAL logging_query_threshold_slow=0;
+SELECT SLEEP(1);
+SLEEP(1)
+0
+4
+
+SHOW VARIABLES WHERE Variable_Name NOT LIKE "%logging_query_filename%" AND Variable_Name LIKE "%logging_query%";
+Variable_name	Value
+logging_query_enable	ON
+logging_query_pcre	.+
+logging_query_threshold_big_examined	0
+logging_query_threshold_big_resultset	0
+logging_query_threshold_slow	0
+2
+SET GLOBAL logging_query_threshold_big_resultset=2;
+SELECT "This should not be logged";
+This should not be logged
+This should not be logged
+2
+
+SHOW VARIABLES WHERE Variable_Name NOT LIKE "%logging_query_filename%" AND Variable_Name LIKE "%logging_query%";
+Variable_name	Value
+logging_query_enable	ON
+logging_query_pcre	.+
+logging_query_threshold_big_examined	0
+logging_query_threshold_big_resultset	2
+logging_query_threshold_slow	0
+2
+SET GLOBAL logging_query_threshold_big_examined=2;
+SELECT "This should not be logged";
+This should not be logged
+This should not be logged
+2
 
=== added directory 'plugin/logging_query/tests/t'
=== added file 'plugin/logging_query/tests/t/file.test'
--- plugin/logging_query/tests/t/file.test	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/t/file.test	2012-07-10 18:31:49 +0000
@@ -0,0 +1,81 @@
+
+# ###########################################################################
+# This tests the dynamic behaviour of logging_query plugin
+# ###########################################################################
+
+# Logging_query plugin is loaded into the system. This checks if the file which we passed through the command line is opened or not.
+--replace_result $DRIZZLETEST_VARDIR DRIZZLETEST_VARDIR
+--exec if [ -f $DRIZZLETEST_VARDIR/logging_query.log ]; then echo "Log file exists"; else echo "Log file does not exist"; fi
+# Clear log file.
+--exec echo "" > $DRIZZLETEST_VARDIR/logging_query.log
+# Double-check that log file is clear.
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+# Since logging_query_enable is OFF by default, this should not be logged into the log file.
+SHOW VARIABLES WHERE Variable_Name NOT LIKE "%logging_query_filename%" AND Variable_Name LIKE "%logging_query%";
+
+#This should not print anything
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+#Enabling logging_query plugin
+SET GLOBAL logging_query_enable=true;
+
+#Now as logging_query_enable is set to true, this should be logged.
+SELECT 1;
+
+#This should print the content of log file as SET GLOBAL query and SELECT query
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+#Setting logging_query_pcre as "SHOW.+". Only queries starting with 'SHOW' will be logged from now.
+SET GLOBAL logging_query_pcre="SHOW.+";
+
+#This should not be logged
+SELECT @@logging_query_enable;
+
+#This should print the content of log file updated with
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log 
+
+#This should be logged
+SHOW VARIABLES WHERE Variable_Name NOT LIKE "%logging_query_filename%" AND Variable_Name LIKE "%logging_query%";
+
+#This should print the content of log file updated with SHOW query as it matched the regex.
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+#Now changing the query log filename
+--replace_result $DRIZZLETEST_VARDIR DRIZZLETEST_VARDIR
+eval SET GLOBAL logging_query_filename="$DRIZZLETEST_VARDIR/logging_query1.log";
+--replace_result $DRIZZLETEST_VARDIR DRIZZLETEST_VARDIR
+#--exec if [ -f $DRIZZLETEST_VARDIR/logging_query1.log ]; then echo "New log file exists"; else echo "New log file does not exist"; fi
+
+# Clear log file.
+--exec echo "" > $DRIZZLETEST_VARDIR/logging_query1.log
+
+# Double-check that log file is clear.
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query1.log
+
+#This should not be logged. Neither into new log file. Nor into new log file.
+SELECT @@logging_query_enable;
+
+#Checking the content of both the files.
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query1.log
+
+#This should be logged into new log file
+SHOW VARIABLES WHERE Variable_Name NOT LIKE "%logging_query_filename%" AND Variable_Name LIKE "%logging_query%";
+
+#Checking the contents of boh the log files.
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query1.log
+
+#Changing log file to null string. This should throw error.
+--error ER_WRONG_ARGUMENTS
+eval SET GLOBAL logging_query_filename="";
+
+--exec rm $DRIZZLETEST_VARDIR/logging_query*.log
+
+# ###########################################################################
+# Done.
+# ###########################################################################
+
 
=== added file 'plugin/logging_query/tests/t/master.opt'
--- plugin/logging_query/tests/t/master.opt	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/t/master.opt	2012-07-10 18:31:49 +0000
@@ -0,0 +1,1 @@
+--plugin-add=logging_query --logging-query.filename=$DRIZZLETEST_VARDIR/logging_query.log
 
=== added file 'plugin/logging_query/tests/t/thresholds.test'
--- plugin/logging_query/tests/t/thresholds.test	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/t/thresholds.test	2012-07-10 18:31:49 +0000
@@ -0,0 +1,87 @@
+
+# ###########################################################################
+# This tests the various logging_query_threshold_ variables.
+# ###########################################################################
+
+# First make sure the logging_query plugin is enabled.
+--replace_result $DRIZZLETEST_VARDIR DRIZZLETEST_VARDIR
+eval SET GLOBAL logging_query_filename="$DRIZZLETEST_VARDIR/logging_query.log";
+eval SET GLOBAL logging_query_pcre=".+";
+--replace_result $DRIZZLETEST_VARDIR DRIZZLETEST_VARDIR
+SET GLOBAL logging_query_enable=true;
+
+# Make sure we have all our threshold variables and that they're all
+# off (zero) by default.
+SHOW VARIABLES LIKE 'logging_query_threshold%';
+
+# ###########################################################################
+# logging_query_threshold_slow
+# ###########################################################################
+
+# Set a 0.5s execution time threshold.
+SET GLOBAL logging_query_threshold_slow=500000;
+SELECT @@logging_query_threshold_slow;
+
+# Clear log file.
+--exec echo "" > $DRIZZLETEST_VARDIR/logging_query.log
+# Double-check that log file is clear.
+--cat_file $DRIZZLETEST_VARDIR/logging_query.log
+
+# This query should *not* log since it's below the threshold.
+SELECT SLEEP(0.4);
+# This should not print anything.
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+# This query should log since it's just a few microseconds past the threshold.
+SELECT SLEEP(0.5);
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+# Set query_log_threshold_execution_time back to zero.
+SET GLOBAL logging_query_threshold_slow=0;
+#This should be logged
+SELECT SLEEP(1);
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+# Clear log file.
+--exec echo "" > $DRIZZLETEST_VARDIR/logging_query.log
+# Double-check that log file is clear.
+--cat_file $DRIZZLETEST_VARDIR/logging_query.log
+
+# ###########################################################################
+# logging_query_threshold_big_resultset
+# ###########################################################################
+# This should be logged
+SHOW VARIABLES WHERE Variable_Name NOT LIKE "%logging_query_filename%" AND Variable_Name LIKE "%logging_query%";
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+SET GLOBAL logging_query_threshold_big_resultset=2;
+
+#This should not be logged
+SELECT "This should not be logged";
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+# Clear log file.
+--exec echo "" > $DRIZZLETEST_VARDIR/logging_query.log
+# Double-check that log file is clear.
+--cat_file $DRIZZLETEST_VARDIR/logging_query.log
+
+# ###########################################################################
+# logging_query_threshold_big_examined
+# ###########################################################################
+# This should be logged
+SHOW VARIABLES WHERE Variable_Name NOT LIKE "%logging_query_filename%" AND Variable_Name LIKE "%logging_query%";
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+#Changing threshold_big_examined to 2, so that queries which examine less that 2 rows will not be logged
+SET GLOBAL logging_query_threshold_big_examined=2;
+#This should not be logged
+SELECT "This should not be logged";
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+# ############################################################################
+# Clean up.
+# ############################################################################
+--exec rm $DRIZZLETEST_VARDIR/logging_query*.log
+
+# ###########################################################################
+# Done.
+# ###########################################################################