Merge lp:~sharan-monikantan/drizzle/trunk-bug-723915-fixed into lp:drizzle

[Sharan Kumar]

The test suite for logging_query plugin has been updated with a lot of intense tests.

[Patrick Crews (patrick-crews)]

Looks good. Thanks for taking the time to fix that one test and to create this suite of tests.

review: Approve

[Brian Aker (brianaker)]

The first run of this spit out some test errors. I can run it again once the current patches make it through.

[Brian Aker (brianaker)]

Running again.

[Sharan Kumar (sharan-monikantan)]

> Running again.
Is the test running without errors? Will this patch make it to the trunk?

[Brian Aker (brianaker)]

Still running:

https://jenkins.drizzle.org/job/Drizzle-Builder/78/console

On Oct 17, 2012, at 10:21 PM, M.Sharan Kumar <email address hidden> wrote:

>> Running again.
> Is the test running without errors? Will this patch make it to the trunk?
> --
> https://code.launchpad.net/~sharan-monikantan/drizzle/trunk-bug-723915-fixed/+merge/128576
> Your team Drizzle Trunk is subscribed to branch lp:drizzle.

[Brian Aker (brianaker)]

Still failing:

https://jenkins.drizzle.org/job/drizzle-build-matrix/254/label=ubuntu-12.04/consoleFull

If you are on an Ubuntu box you can simulate this entire test run by running:

./bootstrap jenkins

[Sharan Kumar (sharan-monikantan)]

> Still failing:
>
> https://jenkins.drizzle.org/job/drizzle-build-
> matrix/254/label=ubuntu-12.04/consoleFull
>
> If you are on an Ubuntu box you can simulate this entire test run by running:
>
> ./bootstrap jenkins

Something which I traced yesterday. The statements like 'SET GLOBAL logging_query_enable=true' are getting logged ( this is the point where the plugin is enabled for the first time in the test, which means, queries following this statements should only be logged, right? ). I am not sure if that is to be logged or not, however, is that something unusual?

[Brian Aker (brianaker)]

From Jenkins:

https://jenkins.drizzle.org/job/drizzle-build-matrix/293/label=ubuntu-12.04/console

logging_query.select [ fail ]
--- ./plugin/logging_query/tests/r/select.result 2012-12-16 15:39:12.973392000 +0300
+++ ./plugin/logging_query/tests/r/select.reject 2012-12-16 16:33:36.880657220 +0300
@@ -98,7 +98,7 @@
 id
 3
 # This should print 13 indicating that the above queries are logged
-Number of queries logged : 13
+Number of queries logged : 12

 # Testing for select with order by
 # The following queries should be logged

drizzletest: Result content mismatch

Stopping All Servers
Restoring snapshot of databases
Resuming Tests

logging_query.thresholds [ pass ] 2488
logging_query.update [ fail ]
--- ./plugin/logging_query/tests/r/update.result 2012-12-16 15:39:12.973392000 +0300
+++ ./plugin/logging_query/tests/r/update.reject 2012-12-16 16:34:02.325636943 +0300
@@ -37,7 +37,7 @@
 4 update
 5 delete
 # This should print 5 indicating that, only the UPDATE query is NOT logged
-Number of queries logged : 2
+Number of queries logged : 1

 # Enabling the logging_query plugin to log UPDATE queries
 SET GLOBAL logging_query_pcre="UPDATE.+";

drizzletest: Result content mismatch

Unmerged revisions

2597. By Sharan Kumar on 2012-10-08

Added the following tests to logging_query plugin
1.blob
2.create
3.datatypes_datetime
4.datatypes_numeric
5.datatypes_string
6.delete
7.insert
8.select
9.update

=== modified file 'plugin/logging_query/tests/parse-query-log.sh'
--- plugin/logging_query/tests/parse-query-log.sh	2012-07-10 18:29:14 +0000
+++ plugin/logging_query/tests/parse-query-log.sh	2012-10-08 20:02:27 +0000
@@ -1,2 +1,2 @@
 #!/bin/sh
-wc -l "$1"|awk '{print($1)}'
+wc -l "$1"|awk '{print("Number of queries logged : "$1)}'

=== added file 'plugin/logging_query/tests/r/blob.result'
--- plugin/logging_query/tests/r/blob.result	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/r/blob.result	2012-10-08 20:02:27 +0000
@@ -0,0 +1,46 @@
+SET GLOBAL logging_query_filename="DRIZZLETEST_VARDIR/logging_query.log";
+Log file exists
+Number of queries logged : 1
+# The logging_query plugin is not enabled and hence none of the following queries should be logged
+DROP SCHEMA IF EXISTS Blob_Test;
+Warnings:
+Note	1008	Can't drop schema 'Blob_Test'; schema doesn't exist
+CREATE SCHEMA Blob_Test;
+USE Blob_Test;
+CREATE TABLE test_blob (data BLOB);
+# Enabling the logging_query plugin
+SET GLOBAL logging_query_enable=true;
+Inserting blob data
+INSERT INTO test_blob VALUES (null);
+INSERT INTO test_blob VALUES ("");
+INSERT INTO test_blob VALUES ("A");
+INSERT INTO test_blob VALUES ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+INSERT INTO test_blob VALUES ("ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ");
+Number of queries logged : 7
+Selecting blob data
+SELECT data FROM test_blob WHERE data LIKE null;
+data
+SELECT data FROM test_blob WHERE data LIKE "";
+data
+
+SELECT data FROM test_blob WHERE data LIKE "A";
+data
+A
+SELECT data FROM test_blob WHERE LENGTH(data) < 100;
+data
+
+A
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+SELECT data FROM test_blob WHERE LENGTH(data) > 1024;
+data
+ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+Number of queries logged : 12
+Deleting blob data
+DELETE FROM test_blob WHERE data LIKE null;
+DELETE FROM test_blob WHERE LENGTH(data) > 1000;
+DELETE FROM test_blob WHERE data = 'A';
+Number of queries logged : 15
+cleaning up...
+SET GLOBAL logging_query_enable=false;
+DROP SCHEMA Blob_Test;
+***done***

=== added file 'plugin/logging_query/tests/r/create.result'
--- plugin/logging_query/tests/r/create.result	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/r/create.result	2012-10-08 20:02:27 +0000
@@ -0,0 +1,61 @@
+# Logging query plugin is loaded into the system. This checks if the file which we passed through the command line is opened or not
+SET GLOBAL logging_query_filename="DRIZZLETEST_VARDIR/logging_query.log";
+Log file exists
+# Clearing the log file
+# Checking if the log file is cleared
+Number of queries logged : 1
+# The above command should print 1 indicating that the file is empty
+# Preparation phase completed
+
+# Starting the test
+# The logging_query is not enabled and hence the following query should not be logged
+DROP SCHEMA IF EXISTS test;
+CREATE SCHEMA test;
+# This should print 1 to indicate the log file is still empty
+Number of queries logged : 1
+# Enabling the logging_query plugin
+SET GLOBAL logging_query_enable=true;
+# The following queries should be logged
+DROP SCHEMA IF EXISTS test_db;
+Warnings:
+Note	1008	Can't drop schema 'test_db'; schema doesn't exist
+CREATE SCHEMA test_db;
+USE test_db;
+# This should print 6 indicating that the above queries are logged
+Number of queries logged : 6
+# Issuing another CREATE query. This should be logged
+CREATE TABLE Test_Entries (test_id INT, test_name VARCHAR(10));
+# This should print 7 to indicate that the above query is logged
+Number of queries logged : 7
+# Enabling logging_query pluging for only SELECT queries
+SET GLOBAL logging_query_pcre="SELECT.+";
+# The following CREATE query should not be logged
+CREATE TABLE Test_Entries_2 (test_id INT, test_name VARCHAR(10));
+# This should print 8 to indicate that the above query is not logged
+Number of queries logged : 8
+# The following SELECT query should be logged
+SELECT * FROM Test_Entries_2;
+test_id	test_name
+# This should print 9 to indicate that the above query is logged
+Number of queries logged : 9
+# Enabling logging_query plugin for only CREATE queries
+SET GLOBAL logging_query_pcre="CREATE.+";
+# The following CREATE query should be logged
+DROP SCHEMA IF EXISTS test_db_2;
+Warnings:
+Note	1008	Can't drop schema 'test_db_2'; schema doesn't exist
+CREATE SCHEMA test_db_2;
+# This should print 11
+Number of queries logged : 11
+# The following SELECT query should not be logged
+SELECT * FROM Test_Entries_2;
+test_id	test_name
+# This should print 11 indicating that the above query is not logged
+Number of queries logged : 11
+cleaning up...
+DROP SCHEMA test;
+DROP SCHEMA test_db;
+DROP SCHEMA test_db_2;
+SET GLOBAL logging_query_enable=false;
+SET GLOBAL logging_query_pcre=".+";
+***done***

=== added file 'plugin/logging_query/tests/r/datatypes_datetime.result'
--- plugin/logging_query/tests/r/datatypes_datetime.result	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/r/datatypes_datetime.result	2012-10-08 20:02:27 +0000
@@ -0,0 +1,117 @@
+SET GLOBAL logging_query_filename="DRIZZLETEST_VARDIR/logging_query.log";
+Log file exists
+Number of queries logged : 1
+# logging_query plugin is not enabled and hence none of the following queries should be logged
+DROP SCHEMA IF EXISTS Test;
+CREATE SCHEMA Test;
+USE Test;
+# Enabling the logging_query plugin
+SET GLOBAL logging_query_enable=true;
+#DATE
+CREATE TABLE test_date (type DATE);
+# Inserting a record with DATE value within the range
+INSERT INTO test_date VALUES ('1990-01-01');
+INSERT INTO test_date VALUES ('2012-01-01');
+# Inserting a record with DATE value on range border
+INSERT INTO test_date VALUES ('0001-01-01');
+INSERT INTO test_date VALUES ('9999-12-31');
+# Selecting the record 
+SELECT type FROM test_date WHERE (EXTRACT(year FROM type) == 1990);
+type
[phone]
+SELECT type FROM test_date WHERE (EXTRACT(month FROM type) == 01);
+type
[phone]
[phone]
+0001-01-01
+SELECT type FROM test_date WHERE (EXTRACT(day FROM type) == 31);
+type
[phone]
+# Deleting the record
+DELETE FROM test_date WHERE (EXTRACT(year FROM type) == 0001);
+DELETE FROM test_date WHERE (EXTRACT(month FROM type) == 01);
+DELETE FROM test_date WHERE (EXTRACT(day FROM type) == 31);
+# Selecting the record ; this should return a NULL set
+SELECT * FROM test_date;
+type
+Number of queries logged : 14
+#TIME
+CREATE TABLE test_time (type TIME);
+# Inserting a record with TIME value within the range
+INSERT INTO test_time VALUES ('09:00:00');
+INSERT INTO test_time VALUES ('15:00:00');
+# Inserting a record with TIME value on range border
+INSERT INTO test_time VALUES ('00:00:00');
+INSERT INTO test_time VALUES ('23:59:59');
+# Selecting the record
+SELECT type FROM test_time WHERE (HOUR(type) == 09);
+type
+09:00:00
+SELECT type FROM test_time WHERE (MINUTE(type) == 00);
+type
+09:00:00
+15:00:00
+00:00:00
+SELECT type FROM test_time WHERE (SECOND(type) == 59);
+type
+23:59:59
+# Deleting the record
+DELETE FROM test_time WHERE (HOUR(type) == 09);
+DELETE FROM test_time WHERE (MINUTE(type) == 00);
+DELETE FROM test_time WHERE (SECOND(type) == 59);
+# Selecting the record ; this should return a NULL set
+SELECT * FROM test_time;
+type
+Number of queries logged : 26
+#DATETIME
+CREATE TABLE test_datetime (type DATETIME);
+# Inserting a record with DATETIME value within the range
+INSERT INTO test_datetime VALUES ('1992-07-22 07:50:30');
+INSERT INTO test_datetime VALUES ('2012-09-29 20:49:50');
+# Insertingt a record with DATETIME value on range border
+INSERT INTO test_datetime VALUES ('0001-01-01 00:00:00');
+INSERT INTO test_datetime VALUES ('9999-12-31 23:59:59');
+# Selecting the record
+SELECT type FROM test_datetime WHERE (EXTRACT(year FROM type) == 1992);
+type
[phone]:50:30
+SELECT type FROM test_datetime WHERE (HOUR(type) == 07);
+type
[phone]:50:30
+# Deleting the record
+DELETE FROM test_datetime WHERE (EXTRACT(year FROM type) == 2012);
+DELETE FROM test_datetime WHERE (MINUTE(type) == 50);
+# Selecting the records ; this should return 2 records
+SELECT * FROM test_datetime;
+type
+0001-01-01 00:00:00
[phone]:59:59
+Number of queries logged : 36
+#TIMESTAMP(6)
+CREATE TABLE test_timestamp (type TIMESTAMP(6));
+# Inserting a record with TIMESTAMP value within the range
+INSERT INTO test_timestamp VALUES ('1992-07-22 07:50:23.324543');
+INSERT INTO test_timestamp VALUES ('2012-09-29 23:12:20.232109');
+# Inserting a record with TIMESTAMP value on range border
+INSERT INTO test_timestamp VALUES ('1970-01-01 00:00:01.000000');
+INSERT INTO test_timestamp VALUES ('2038-01-19 03:14:07.999999');
+# Selecting the record
+SELECT type FROM test_timestamp WHERE (EXTRACT(year FROM type) == 1970);
+type
[phone]:00:01.000000
+SELECT type FROM test_timestamp WHERE (HOUR(type) == 03);
+type
[phone]:14:07.999999
+# Deleting the record
+DELETE FROM test_timestamp WHERE (EXTRACT(year FROM type) == 1992);
+DELETE FROM test_timestamp WHERE (MINUTE(type) == 12);
+# Selecting the records ; this should return 2 records
+SELECT * FROM test_timestamp;
+type
[phone]:00:01.000000
[phone]:14:07.999999
+Number of queries logged : 46
+cleaning up...
+SET GLOBAL logging_query_enable=false;
+DROP SCHEMA Test;
+***done***

=== added file 'plugin/logging_query/tests/r/datatypes_numeric.result'
--- plugin/logging_query/tests/r/datatypes_numeric.result	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/r/datatypes_numeric.result	2012-10-08 20:02:27 +0000
@@ -0,0 +1,97 @@
+SET GLOBAL logging_query_filename="DRIZZLETEST_VARDIR/logging_query.log";
+Log file exists
+Number of queries logged : 1
+# logging_query plugin is not enabled and hence none of the following queries should be logged
+DROP SCHEMA IF EXISTS Test;
+CREATE SCHEMA Test;
+USE Test;
+# Enabling the logging_query plugin
+SET GLOBAL logging_query_enable=true;
+#INTEGER
+CREATE TABLE test_integer (type INTEGER);
+# Inserting a record with INTEGER value within range
+INSERT INTO test_integer VALUES (2147483645);
+INSERT INTO test_integer VALUES (-2147483645);
+# Inserting a record with INTEGER value on range borders
+INSERT INTO test_integer VALUES (2147483647);
+INSERT INTO test_integer VALUES (-2147483648);
+# Selecting the record from table
+SELECT type FROM test_integer WHERE type > 0;
+type
[phone]
[phone]
+SELECT type FROM test_integer WHERE type < 0;
+type
+-2147483645
+-2147483648
+# Deleting a record from table
+DELETE FROM test_integer WHERE type > 0;
+# This SELECT should return only two records
+SELECT * FROM test_integer;
+type
+-2147483645
+-2147483648
+# Deleting a record from table
+DELETE FROM test_integer WHERE type < 0;
+# This SELECT should return a NULL set
+SELECT * FROM test_integer;
+type
+Number of queries logged : 13
+#BIGINT
+CREATE TABLE test_bigint (type BIGINT);
+# Inserting a record with BIGINT value within range
+INSERT INTO test_bigint VALUES (9223372036854775805);
+INSERT INTO test_bigint VALUES (-9223372036854775805);
+# Inserting a record with BIGINT value on range borders
+INSERT INTO test_bigint VALUES (9223372036854775807);
+INSERT INTO test_bigint VALUES (-9223372036854775808);
+# Selecting the record from table
+SELECT type FROM test_bigint WHERE type > 0;
+type
+9223372036854775805
+9223372036854775807
+SELECT type FROM test_bigint WHERE type < 0;
+type
+-9223372036854775805
+-9223372036854775808
+# Deleting a record from table
+DELETE FROM test_bigint WHERE type > 0;
+# This SELECT should return only two records
+SELECT * FROM test_bigint;
+type
+-9223372036854775805
+-9223372036854775808
+# Deleting a record from table
+DELETE FROM test_bigint WHERE type < 0;
+# This SELECT should return a NULL set
+SELECT * FROM test_bigint;
+type
+Number of queries logged : 24
+#DOUBLE
+CREATE TABLE test_double (type DOUBLE);
+#Inserting a record with DOUBLE value within range
+INSERT INTO test_double VALUES (-1.7976931348623155E+308);
+INSERT INTO test_double VALUES (1.7976931348623157E+308);
+# Selecting the record from table
+SELECT type FROM test_double WHERE type > 0;
+type
+1.79769313486232e308
+SELECT type FROM test_double WHERE type < 0;
+type
+-1.79769313486232e308
+# Deleting a record from table
+DELETE FROM test_double WHERE type > 0;
+# This SELECT should return only one record
+SELECT * FROM test_double;
+type
+-1.79769313486232e308
+# Deleting a record from table
+DELETE FROM test_double WHERE type < 0;
+# This SELECT should return a NULL set
+SELECT * FROM test_double;
+type
+Number of queries logged : 33
+cleaning up...
+SET GLOBAL logging_query_enable=false;
+DROP SCHEMA Test;
+***done***

=== added file 'plugin/logging_query/tests/r/datatypes_string.result'
--- plugin/logging_query/tests/r/datatypes_string.result	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/r/datatypes_string.result	2012-10-08 20:02:27 +0000
@@ -0,0 +1,62 @@
+SET GLOBAL logging_query_filename="DRIZZLETEST_VARDIR/logging_query.log";
+Log file exists
+Number of queries logged : 1
+# logging_query plugin is not enabled and hence none of the following queries should be logged
+DROP SCHEMA IF EXISTS Test;
+CREATE SCHEMA Test;
+USE Test;
+# Enabling the logging_query plugin
+SET GLOBAL logging_query_enable=true;
+#VARCHAR
+CREATE TABLE test_varchar (type VARCHAR(10));
+# Inserting a record with VARCHAR length within range
+INSERT INTO test_varchar VALUES ('varchar');
+INSERT INTO test_varchar VALUES ('sql');
+# Inserting a record with VARCHAR length on range borders
+INSERT INTO test_varchar VALUES ('drizzle-DB');
+INSERT INTO test_varchar VALUES ('');
+# Selecting records from table
+SELECT type FROM test_varchar WHERE LENGTH(type) = 3;
+type
+sql
+SELECT type FROM test_varchar WHERE LENGTH(type) = 0;
+type
+
+# Deleting records
+DELETE FROM test_varchar WHERE type LIKE REVERSE('rahcrav');
+DELETE FROM test_varchar WHERE type LIKE SUBSTRING('mysql',3);
+# Selecting records from table ; this should return 2 rows
+SELECT * FROM test_varchar;
+type
+drizzle-DB
+
+Number of queries logged : 12
+#ENUM
+CREATE TABLE test_enum (type ENUM('one','two','three','four','five','six','seven','eight','nine','ten'));
+# Inserting a record with ENUM value within range
+INSERT INTO test_enum VALUES (3);
+INSERT INTO test_enum VALUES (7);
+# Inserting a record with ENUM value on range border
+INSERT INTO test_enum VALUES (1);
+INSERT INTO test_enum VALUES (9);
+# Selecting records from table
+SELECT type FROM test_enum WHERE type > 5;
+type
+seven
+nine
+SELECT type FROM test_enum WHERE type < 5;
+type
+three
+one
+# Deleting records
+DELETE FROM test_enum WHERE type = 9;
+DELETE FROM test_enum WHERE type > 1;
+# Selecting records from table ; this should return 1 row
+SELECT * FROM test_enum;
+type
+one
+Number of queries logged : 22
+cleaning up...
+SET GLOBAL logging_query_enable=false;
+DROP SCHEMA Test;
+***done***

=== added file 'plugin/logging_query/tests/r/delete.result'
--- plugin/logging_query/tests/r/delete.result	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/r/delete.result	2012-10-08 20:02:27 +0000
@@ -0,0 +1,104 @@
+SET GLOBAL logging_query_filename="DRIZZLETEST_VARDIR/logging_query.log";
+Log file exists
+Number of queries logged : 1
+Preparing the test bed...
+# The logging_query plugin is not yet enabled and hence none of the queries in the prepare phase should be logged
+DROP SCHEMA IF EXISTS Test_Delete;
+Warnings:
+Note	1008	Can't drop schema 'Test_Delete'; schema doesn't exist
+CREATE SCHEMA Test_Delete;
+DROP SCHEMA IF EXISTS Test_Truncate;
+Warnings:
+Note	1008	Can't drop schema 'Test_Truncate'; schema doesn't exist
+CREATE SCHEMA Test_Truncate;
+DROP SCHEMA IF EXISTS Test_Drop;
+Warnings:
+Note	1008	Can't drop schema 'Test_Drop'; schema doesn't exist
+CREATE SCHEMA Test_Drop;
+# Preparing test bed for DELETE test
+USE Test_Delete;
+CREATE TABLE test_delete_1 ( test_id INT, test_name CHAR(10) );
+INSERT INTO test_delete_1  VALUES (1,"create"),(2,"select"),(3,"insert"),(4,"update"),(5,"delete");
+CREATE TABLE test_delete_2 ( test_id INT, test_name VARCHAR(10) );
+INSERT INTO test_delete_1 VALUES (1,"create"),(2,"select"),(3,"insert"),(4,"update"),(5,"delete");
+# Preparing test bed for TRUNCATE test
+USE Test_Truncate;
+CREATE TABLE test_truncate_1 ( test_id INT, test_name CHAR(10) );
+INSERT INTO test_truncate_1 VALUES (1,"create"),(2,"select"),(3,"insert"),(4,"update"),(5,"delete");
+CREATE TABLE test_truncate_2 ( test_id INT, test_name CHAR(10) );
+INSERT INTO test_truncate_2 VALUES (1,"create"),(2,"select"),(3,"insert"),(4,"update"),(5,"delete");
+# Preparing test bed for DROP test
+USE Test_Drop;
+CREATE TABLE test_drop ( test_id INT, test_name CHAR(10) );
+CREATE INDEX index_id ON test_drop ( test_id );
+INSERT INTO test_drop VALUES (1,"create"),(2,"select"),(3,"insert"),(4,"update"),(5,"delete");
+# This should print 1 indicating that, the log file is still empty
+Number of queries logged : 1
+# enabling the logging_query plugin
+SET GLOBAL logging_query_enable=true;
+# Now the tests begin!!!
+DELETE test in progress...
+USE Test_Delete;
+# The following 2 queries should be logged
+DELETE FROM test_delete_1;
+# The following query should return a null set
+SELECT * FROM test_delete_1;
+test_id	test_name
+# enabling the logging_query plugin to log only DELETE queries
+SET GLOBAL logging_query_pcre="DELETE.+";
+# The following DELETE queries should be logged
+DELETE FROM test_delete_2 WHERE test_id = 1;
+DELETE FROM test_delete_2 WHERE test_name = "select";
+# The following query should select only tuples with id = (3,4,5) and this query should not be logged
+SELECT * FROM test_delete_2;
+test_id	test_name
+# enabling the logging_query plugin to log SELECT queries
+SET GLOBAL logging_query_pcre="SELECT.+";
+# The following DELETE query should not be logged
+DELETE FROM test_delete_2;
+# The following SELECT query should return a null set and should be logged
+SELECT * FROM test_delete_2;
+test_id	test_name
+# Delete test is completed. Now checking the logging_query.log file. This should print 10
+Number of queries logged : 10
+TRUNCATE test in progress...
+USE Test_Truncate;
+# enabling the logging_query plugin to log TRUNCATE queries
+SET GLOBAL logging_query_pcre="TRUNCATE.+";
+# The following TRUNCATE query should be logged
+TRUNCATE TABLE test_truncate_1;
+# This SELECT query should not be logged ; this should return a null set
+SELECT * FROM test_truncate_1;
+test_id	test_name
+# enabling the logging_query plugin to log RENAME query
+SET GLOBAL logging_query_pcre="RENAME.+";
+# The following RENAME query should be logged
+RENAME TABLE test_truncate_2 TO test_truncate;
+# This TRUNCATE query should not be logged
+TRUNCATE TABLE test_truncate;
+# This SELECT query should not be logged ; this should return a null set
+SELECT * FROM test_truncate;
+test_id	test_name
+# Truncate test is completed. Now checking the logging_query.log file. This should print 14
+Number of queries logged : 14
+DROP test in progress...
+USE Test_Drop;
+# enabling the logging_query plugin to log DROP queries
+SET GLOBAL logging_query_pcre="DROP.+";
+# dropping an index ; this query should be logged since it is a DROP query ( though implemented through ALTER query )
+ALTER TABLE test_drop DROP INDEX index_id;
+# dropping a table  ; this query should be logged
+DROP TABLE test_drop;
+# dropping a schema ; this query should be logged
+DROP SCHEMA Test_Drop;
+# Drop test is completed. Now checking the logging_query.log file. This should print 18
+Number of queries logged : 18
+cleaning up...
+SET GLOBAL logging_query_enable=false;
+SET GLOBAL logging_query_pcre=".+";
+DROP SCHEMA IF EXISTS Test_Delete;
+DROP SCHEMA IF EXISTS Test_Truncate;
+DROP SCHEMA IF EXISTS Test_Drop;
+Warnings:
+Note	1008	Can't drop schema 'Test_Drop'; schema doesn't exist
+***done***

=== modified file 'plugin/logging_query/tests/r/file.result'
--- plugin/logging_query/tests/r/file.result	2012-07-10 18:29:14 +0000
+++ plugin/logging_query/tests/r/file.result	2012-10-08 20:02:27 +0000
@@ -1,23 +1,33 @@
+SET GLOBAL logging_query_filename="DRIZZLETEST_VARDIR/logging_query.log";
 Log file exists
-1
+Number of queries logged : 1
+# 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%";
 Variable_name	Value
 logging_query_enable	OFF
-logging_query_pcre	 
+logging_query_pcre	.+
 logging_query_threshold_big_examined	0
 logging_query_threshold_big_resultset	0
 logging_query_threshold_slow	0
-1
+#This should not print anything
+Number of queries logged : 1
+#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;
 1
 1
-3
+#This should print the content of log file as SET GLOBAL query and SELECT query
+Number of queries logged : 3
+#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;
 @@logging_query_enable
 1
-4
+#This should print the content of log file updated with
+Number of queries logged : 4
+#This should be logged
 SHOW VARIABLES WHERE Variable_Name NOT LIKE "%logging_query_filename%" AND Variable_Name LIKE "%logging_query%";
 Variable_name	Value
 logging_query_enable	ON
@@ -25,14 +35,22 @@
 logging_query_threshold_big_examined	0
 logging_query_threshold_big_resultset	0
 logging_query_threshold_slow	0
-5
+#This should print the content of log file updated with SHOW query as it matched the regex.
+Number of queries logged : 5
+#Now changing the query log filename
 SET GLOBAL logging_query_filename="DRIZZLETEST_VARDIR/logging_query1.log";
-1
+New log file exists
+# Clear log file.
+# Double-check that log file is clear.
+Number of queries logged : 1
+#This should not be logged. Neither into new log file. Nor into new log file.
 SELECT @@logging_query_enable;
 @@logging_query_enable
 1
-5
-1
+#Checking the content of both the files.
+Number of queries logged : 5
+Number of queries logged : 1
+#This should be logged into new log file
 SHOW VARIABLES WHERE Variable_Name NOT LIKE "%logging_query_filename%" AND Variable_Name LIKE "%logging_query%";
 Variable_name	Value
 logging_query_enable	ON
@@ -40,7 +58,14 @@
 logging_query_threshold_big_examined	0
 logging_query_threshold_big_resultset	0
 logging_query_threshold_slow	0
-5
-2
+#Checking the contents of boh the log files.
+Number of queries logged : 5
+Number of queries logged : 2
+#Changing log file to null string. This should throw error.
 SET GLOBAL logging_query_filename="";
 ERROR HY000: Incorrect arguments to SET
+cleaning up...
+SET GLOBAL logging_query_enable=false;
+SET GLOBAL logging_query_pcre="*";
+SET GLOBAL logging_query_filename="DRIZZLETEST_VARDIR/logging_query.log";
+***done***

=== added file 'plugin/logging_query/tests/r/insert.result'
--- plugin/logging_query/tests/r/insert.result	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/r/insert.result	2012-10-08 20:02:27 +0000
@@ -0,0 +1,85 @@
+SET GLOBAL logging_query_filename="DRIZZLETEST_VARDIR/logging_query.log";
+Log file exists
+Number of queries logged : 1
+preparing the test bed...
+# The logging_query plugin is not enabled and hence the following queries should not be logged
+DROP SCHEMA IF EXISTS Test;
+CREATE SCHEMA Test;
+USE Test;
+CREATE TABLE test_info (test_id INT, test_name VARCHAR(10));
+INSERT INTO test_info (test_id,test_name) VALUES (0,null);
+# This should  print 1 indicating the log file is still empty
+Number of queries logged : 1
+
+# Now the test begins!!!
+# Enabling the logging_query plugin
+SET GLOBAL logging_query_enable=true;
+# The following queries should be logged
+INSERT INTO test_info (test_id) VALUES (1);
+INSERT INTO test_info (test_id,test_name) VALUES (1,"create");
+INSERT INTO test_info VALUES (2,"select");
+SELECT * FROM test_info;
+test_id	test_name
+0	NULL
+1	NULL
+1	create
+2	select
+# This should print 6 indicating that, all of the above queries are logged
+Number of queries logged : 6
+# Enabling the logging_query plugin to log only INSERT queries
+SET GLOBAL logging_query_pcre="INSERT.+";
+# The following INSERT query should be logged
+INSERT INTO test_info (test_id,test_name) VALUES (3,"insert");
+INSERT INTO test_info VALUES (4,"drop"),(5,"delete");
+SELECT test_name FROM test_info;
+test_name
+NULL
+NULL
+create
+select
+insert
+drop
+delete
+DELETE FROM test_info WHERE test_id = 0;
+SELECT * FROM test_info;
+test_id	test_name
+1	NULL
+1	create
+2	select
+3	insert
+4	drop
+5	delete
+# This should print 9 indicating that, only the INSERT queries were logged
+Number of queries logged : 9
+# Enabling the logging_query plugin to log SELECT queries
+SET GLOBAL logging_query_pcre="SELECT.+";
+# The following INSERT queries should NOT be logged
+INSERT INTO test_info VALUES (5,"delete");
+SELECT test_name AS tests FROM test_info;
+tests
+NULL
+create
+select
+insert
+drop
+delete
+delete
+SELECT * FROM test_info WHERE test_id > 3;
+test_id	test_name
+4	drop
+5	delete
+5	delete
+# This should print 12 indicating that, the INSERT query is NOT logged
+Number of queries logged : 12
+# Enabling the logging_query plugin to log DELETE queries
+SET GLOBAL logging_query_pcre="DELETE.+";
+# The following INSERT queries should NOT be logged
+INSERT INTO test_info VALUES (6,""),(7,"enums");
+DELETE FROM test_info WHERE test_id=6 OR 7;
+# This should print 14 indicating that, the INSERT query is NOT Logged
+Number of queries logged : 14
+cleaning up...
+SET GLOBAL logging_query_enable=false;
+SET GLOBAL logging_query_pcre=".+";
+DROP SCHEMA Test;
+***done***

=== added file 'plugin/logging_query/tests/r/select.result'
--- plugin/logging_query/tests/r/select.result	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/r/select.result	2012-10-08 20:02:27 +0000
@@ -0,0 +1,130 @@
+SET GLOBAL logging_query_filename="DRIZZLETEST_VARDIR/logging_query.log";
+Log file exists
+Number of queries logged : 1
+Preparing the test bed...
+CREATE SCHEMA Select_Test;
+USE Select_Test;
+CREATE TABLE select_test_1 (id INT, type CHAR(20));
+INSERT INTO select_test_1 VALUES (1,"basic select"),(2,"select distinct"),(3,"select with where"),(4,"select with orderby");
+CREATE TABLE select_test_2 (id INT, time FLOAT);
+INSERT INTO select_test_2 VALUES (1,10.01),(2,9.38),(3,5.6),(4,6.7);
+prepare phase completed...
+
+Testing basic select queries. 
+# The logging_query is not enabled and hence the following select queries should not be logged
+SELECT 1;
+1
+1
+SELECT "logging_query";
+logging_query
+logging_query
+# This should print 1 to indicate the log file is still empty
+Number of queries logged : 1
+
+# Enabling the logging_query plugin
+SET GLOBAL logging_query_enable=true;
+
+# The logging_query is enabled and the following select query should be logged
+SELECT 1;
+1
+1
+# This should print 3 indicating that the above query is logged
+Number of queries logged : 3
+# Issuing another select query
+SELECT "hello world";
+hello world
+hello world
+# This should print 4 indicating that the above query is logged
+Number of queries logged : 4
+
+# Enabling the logging_query to log only SHOW queries
+SET GLOBAL logging_query_pcre="SHOW.+";
+
+# The following query should be logged
+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
+# This should print 6 indicating that the above query is logged
+Number of queries logged : 6
+
+# The following select query should not be logged
+SELECT 1;
+1
+1
+# This should print 4 indicating that the above query is not logged
+Number of queries logged : 6
+# Basic test completed...
+
+drilling the SELECT queries test.
+# Enabling the logging_query plugin to log SELECT queries 
+# ( since here after, the test deals with variants of SELECT queries and all such should be checked against logging)
+SET GLOBAL logging_query_pcre="SELECT.+";
+
+# Testing for select with distinct
+# The following queries should be logged
+SELECT DISTINCT * FROM select_test_1;
+id	type
+1	basic select
+2	select distinct
+3	select with where
+4	select with orderby
+SELECT DISTINCT * FROM select_test_2;
+id	time
+1	10.01
+2	9.38
+3	5.6
+4	6.7
+# This should print 9 indicating that the above queries are logged
+Number of queries logged : 9
+
+# Testing for select with where
+# The following queries should be logged
+SELECT * FROM select_test_1 WHERE id = 2;
+id	type
+2	select distinct
+SELECT * FROM select_test_1 WHERE type = "select with where";
+id	type
+3	select with where
+SELECT time FROM select_test_2 WHERE id >= 2;
+time
+9.38
+5.6
+6.7
+SELECT id FROM select_test_2 WHERE time < 6;
+id
+3
+# This should print 13 indicating that the above queries are logged
+Number of queries logged : 13
+
+# Testing for select with order by
+# The following queries should be logged
+SELECT * FROM select_test_2 ORDER BY id DESC;
+id	time
+4	6.7
+3	5.6
+2	9.38
+1	10.01
+SELECT time FROM select_test_2 ORDER BY time;
+time
+5.6
+6.7
+9.38
+10.01
+SELECT id FROM select_test_2 ORDER BY time DESC;
+id
+1
+2
+4
+3
+# This should print 16 indicating all the above queries are logged
+Number of queries logged : 16
+
+cleaning up...
+DROP SCHEMA Select_Test;
+SET GLOBAL logging_query_enable=false;
+SET GLOBAL logging_query_pcre=".+";
+***done***

=== modified file 'plugin/logging_query/tests/r/thresholds.result'
--- plugin/logging_query/tests/r/thresholds.result	2012-07-10 18:29:14 +0000
+++ plugin/logging_query/tests/r/thresholds.result	2012-10-08 20:02:27 +0000
@@ -14,16 +14,16 @@
 SELECT SLEEP(0.4);
 SLEEP(0.4)
 0
-1
+Number of queries logged : 1
 SELECT SLEEP(0.5);
 SLEEP(0.5)
 0
-2
+Number of queries logged : 2
 SET GLOBAL logging_query_threshold_slow=0;
 SELECT SLEEP(1);
 SLEEP(1)
 0
-4
+Number of queries logged : 4
 
 SHOW VARIABLES WHERE Variable_Name NOT LIKE "%logging_query_filename%" AND Variable_Name LIKE "%logging_query%";
 Variable_name	Value
@@ -32,12 +32,12 @@
 logging_query_threshold_big_examined	0
 logging_query_threshold_big_resultset	0
 logging_query_threshold_slow	0
-2
+Number of queries logged : 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
+Number of queries logged : 2
 
 SHOW VARIABLES WHERE Variable_Name NOT LIKE "%logging_query_filename%" AND Variable_Name LIKE "%logging_query%";
 Variable_name	Value
@@ -46,9 +46,13 @@
 logging_query_threshold_big_examined	0
 logging_query_threshold_big_resultset	2
 logging_query_threshold_slow	0
-2
+Number of queries logged : 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
+Number of queries logged : 2
+cleaning up...
+SET GLOBAL logging_query_enable=false;
+SET GLOBAL logging_query_pcre=".+";
+***done***

=== added file 'plugin/logging_query/tests/r/update.result'
--- plugin/logging_query/tests/r/update.result	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/r/update.result	2012-10-08 20:02:27 +0000
@@ -0,0 +1,62 @@
+SET GLOBAL logging_query_filename="DRIZZLETEST_VARDIR/logging_query.log";
+Log file exists
+Number of queries logged : 1
+preparing the test bed...
+# The logging_query plugin is not enabled and hence none of the queries in prepare phase should be logged
+CREATE SCHEMA Test_Update;
+USE Test_Update;
+CREATE TABLE test_info (id INT, name CHAR(10));
+INSERT INTO test_info VALUES (1,"create"),(2,"select"),(3,"insert"),(4,"update"),(5,"delete");
+# This should print 1 indicating that the log file is still empty
+Number of queries logged : 1
+
+UPDATE test in progress...
+# The logging_query plugin is not enabled and the following update query should not be logged
+UPDATE test_info SET name="CREATE" WHERE id=1;
+# This should print 1 indicating that the log file is still empty
+Number of queries logged : 1
+
+# Enabling the logging_query plugin
+SET GLOBAL logging_query_enable=true;
+
+# The logging_query plugin is enabled and the following update query should be logged
+UPDATE test_info SET name="SELECT" WHERE id=2;
+# This should print 3 indicating that the above query is logged
+Number of queries logged : 1
+
+# Enabling the logging_query plugin to log only select queries
+SET GLOBAL logging_query_pcre="SELECT.+";
+
+# The following UPDATE query should not be logged
+UPDATE test_info SET name="INSERT" WHERE id=3;
+SELECT * FROM test_info;
+id	name
+1	CREATE
+2	SELECT
+3	INSERT
+4	update
+5	delete
+# This should print 5 indicating that, only the UPDATE query is NOT logged
+Number of queries logged : 2
+
+# Enabling the logging_query plugin to log UPDATE queries 
+SET GLOBAL logging_query_pcre="UPDATE.+";
+
+# The followihng UPDATE query should be logged
+UPDATE test_info SET name="UPDATE" WHERE id=6;
+# The above query will not update the table since a tuple with id=6 does not exist
+SELECT * FROM test_info;
+id	name
+1	CREATE
+2	SELECT
+3	INSERT
+4	update
+5	delete
+# This should print 7 indicating that, only the UPDATE query is logged and not the select query
+Number of queries logged : 2
+
+cleaning up...
+SET GLOBAL logging_query_enable=false;
+SET GLOBAL logging_query_pcre=".+";
+DROP SCHEMA Test_Update;
+***done***

=== added file 'plugin/logging_query/tests/t/blob.test'
--- plugin/logging_query/tests/t/blob.test	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/t/blob.test	2012-10-08 20:02:27 +0000
@@ -0,0 +1,84 @@
+
+# ###########################################################################################
+# This test runs several tests against the BLOB type
+# ###########################################################################################
+
+# logging_query plugin is loaded into the system. This is to check that the file passed through the command line is opened or not
+--replace_result $DRIZZLETEST_VARDIR DRIZZLETEST_VARDIR
+eval SET GLOBAL logging_query_filename="$DRIZZLETEST_VARDIR/logging_query.log";
+--exec if [ -f $DRIZZLETEST_VARDIR/logging_query.log ]; then echo "Log file exists"; else echo "log file does not exist"; fi
+
+# Clearing the log file
+--exec echo "" > $DRIZZLETEST_VARDIR/logging_query.log
+# Checking if the file is cleared or not
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+# The above command should print 1 indicating that the log file is empty
+
+--echo # The logging_query plugin is not enabled and hence none of the following queries should be logged
+DROP SCHEMA IF EXISTS Blob_Test;
+CREATE SCHEMA Blob_Test;
+USE Blob_Test;
+CREATE TABLE test_blob (data BLOB);
+
+--echo # Enabling the logging_query plugin
+SET GLOBAL logging_query_enable=true;
+
+# ###########################################################################################
+# Insert BLOB data
+# ###########################################################################################
+
+--echo Inserting blob data
+INSERT INTO test_blob VALUES (null);
+INSERT INTO test_blob VALUES ("");
+INSERT INTO test_blob VALUES ("A");
+INSERT INTO test_blob VALUES ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+INSERT INTO test_blob VALUES ("ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ");
+
+# Testing if the above queries are logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+
+# ###########################################################################################
+# Select BLOB data
+# ###########################################################################################
+
+--echo Selecting blob data
+SELECT data FROM test_blob WHERE data LIKE null;
+SELECT data FROM test_blob WHERE data LIKE "";
+SELECT data FROM test_blob WHERE data LIKE "A";
+SELECT data FROM test_blob WHERE LENGTH(data) < 100;
+SELECT data FROM test_blob WHERE LENGTH(data) > 1024;
+
+
+# Testing if the above queries are logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+
+# ###########################################################################################
+# Deleting BLOB data
+# ###########################################################################################
+
+--echo Deleting blob data
+DELETE FROM test_blob WHERE data LIKE null;
+DELETE FROM test_blob WHERE LENGTH(data) > 1000;
+DELETE FROM test_blob WHERE data = 'A';
+
+
+# Testing if the above queries are logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+
+
+# ####################################################################################################
+# Cleaning up
+# ####################################################################################################
+--echo cleaning up...
+SET GLOBAL logging_query_enable=false;
+DROP SCHEMA Blob_Test;
+--exec rm $DRIZZLETEST_VARDIR/logging_query.log
+--echo ***done***
+
+# ####################################################################################################
+# Done
+# ####################################################################################################
+

=== added file 'plugin/logging_query/tests/t/create.test'
--- plugin/logging_query/tests/t/create.test	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/t/create.test	2012-10-08 20:02:27 +0000
@@ -0,0 +1,80 @@
+
+# ##################################################################################
+# This tests the logging_query plugin for various create queries
+# ##################################################################################
+
+--echo # 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
+eval SET GLOBAL logging_query_filename="$DRIZZLETEST_VARDIR/logging_query.log";
+--exec if [ -f $DRIZZLETEST_VARDIR/logging_query.log ]; then echo "Log file exists"; else echo "Log file does not exist"; fi
+
+--echo # Clearing the log file
+--exec echo "" > $DRIZZLETEST_VARDIR/logging_query.log
+--echo # Checking if the log file is cleared
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+--echo # The above command should print 1 indicating that the file is empty
+--echo # Preparation phase completed
+--echo 
+
+--echo # Starting the test
+--echo # The logging_query is not enabled and hence the following query should not be logged
+DROP SCHEMA IF EXISTS test;
+CREATE SCHEMA test;
+--echo # This should print 1 to indicate the log file is still empty
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+--echo # Enabling the logging_query plugin
+SET GLOBAL logging_query_enable=true;
+
+--echo # The following queries should be logged
+DROP SCHEMA IF EXISTS test_db;
+CREATE SCHEMA test_db;
+USE test_db;
+--echo # This should print 6 indicating that the above queries are logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+--echo # Issuing another CREATE query. This should be logged
+CREATE TABLE Test_Entries (test_id INT, test_name VARCHAR(10));
+--echo # This should print 7 to indicate that the above query is logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+--echo # Enabling logging_query pluging for only SELECT queries
+SET GLOBAL logging_query_pcre="SELECT.+";
+
+--echo # The following CREATE query should not be logged
+CREATE TABLE Test_Entries_2 (test_id INT, test_name VARCHAR(10));
+--echo # This should print 8 to indicate that the above query is not logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+--echo # The following SELECT query should be logged
+SELECT * FROM Test_Entries_2;
+--echo # This should print 9 to indicate that the above query is logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+--echo # Enabling logging_query plugin for only CREATE queries
+SET GLOBAL logging_query_pcre="CREATE.+";
+
+--echo # The following CREATE query should be logged
+DROP SCHEMA IF EXISTS test_db_2;
+CREATE SCHEMA test_db_2;
+--echo # This should print 11
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+--echo # The following SELECT query should not be logged
+SELECT * FROM Test_Entries_2;
+--echo # This should print 11 indicating that the above query is not logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+# ###################################################################################
+# Clean up
+# ###################################################################################
+--echo cleaning up...
+DROP SCHEMA test;
+DROP SCHEMA test_db;
+DROP SCHEMA test_db_2;
+SET GLOBAL logging_query_enable=false;
+SET GLOBAL logging_query_pcre=".+";
+--exec rm $DRIZZLETEST_VARDIR/logging_query.log
+--echo ***done***
+
+# ###################################################################################
+# Done
+# ###################################################################################

=== added file 'plugin/logging_query/tests/t/datatypes_datetime.test'
--- plugin/logging_query/tests/t/datatypes_datetime.test	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/t/datatypes_datetime.test	2012-10-08 20:02:27 +0000
@@ -0,0 +1,151 @@
+
+# ##############################################################################################################################################
+# Test for Drizzle's  datatypes
+# Test whether the logging_query plugin logs each case of the datatype (we enable the plugin throughout the test and check if it logs each case) 
+# cases:
+#      1.Type
+#      2.Range
+#      3.Select, Insert, Delete queries
+# ##############################################################################################################################################
+
+# logging_query plugin is loaded into the system and this checks if the file we passed through the command line is opened or not
+--replace_result $DRIZZLETEST_VARDIR DRIZZLETEST_VARDIR
+eval SET GLOBAL logging_query_filename="$DRIZZLETEST_VARDIR/logging_query.log";
+--exec if [ -f $DRIZZLETEST_VARDIR/logging_query.log ]; then echo "Log file exists"; else echo "Log file does not exist"; fi
+
+# Clearing the log file
+--exec echo "" > $DRIZZLETEST_VARDIR/logging_query.log
+# Checking if the file is cleared or not
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+# The above command should print 1 indicating that the log file is empty
+
+# ###################################################################################################
+# Preparing the test bed
+# ###################################################################################################
+
+--echo # logging_query plugin is not enabled and hence none of the following queries should be logged
+DROP SCHEMA IF EXISTS Test;
+CREATE SCHEMA Test;
+USE Test;
+
+--echo # Enabling the logging_query plugin
+SET GLOBAL logging_query_enable=true;
+
+# ###################################################################################################
+# DATE
+# ###################################################################################################
+
+--echo #DATE
+CREATE TABLE test_date (type DATE);
+--echo # Inserting a record with DATE value within the range
+INSERT INTO test_date VALUES ('1990-01-01');
+INSERT INTO test_date VALUES ('2012-01-01');
+--echo # Inserting a record with DATE value on range border
+INSERT INTO test_date VALUES ('0001-01-01');
+INSERT INTO test_date VALUES ('9999-12-31');
+--echo # Selecting the record 
+SELECT type FROM test_date WHERE (EXTRACT(year FROM type) == 1990);
+SELECT type FROM test_date WHERE (EXTRACT(month FROM type) == 01);
+SELECT type FROM test_date WHERE (EXTRACT(day FROM type) == 31);
+--echo # Deleting the record
+DELETE FROM test_date WHERE (EXTRACT(year FROM type) == 0001);
+DELETE FROM test_date WHERE (EXTRACT(month FROM type) == 01);
+DELETE FROM test_date WHERE (EXTRACT(day FROM type) == 31);
+--echo # Selecting the record ; this should return a NULL set
+SELECT * FROM test_date;
+
+# Testing if the above queries are logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+
+# ####################################################################################################
+# TIME
+# ####################################################################################################
+
+--echo #TIME
+CREATE TABLE test_time (type TIME);
+--echo # Inserting a record with TIME value within the range
+INSERT INTO test_time VALUES ('09:00:00');
+INSERT INTO test_time VALUES ('15:00:00');
+--echo # Inserting a record with TIME value on range border
+INSERT INTO test_time VALUES ('00:00:00');
+INSERT INTO test_time VALUES ('23:59:59');
+--echo # Selecting the record
+SELECT type FROM test_time WHERE (HOUR(type) == 09);
+SELECT type FROM test_time WHERE (MINUTE(type) == 00);
+SELECT type FROM test_time WHERE (SECOND(type) == 59);
+--echo # Deleting the record
+DELETE FROM test_time WHERE (HOUR(type) == 09);
+DELETE FROM test_time WHERE (MINUTE(type) == 00);
+DELETE FROM test_time WHERE (SECOND(type) == 59);
+--echo # Selecting the record ; this should return a NULL set
+SELECT * FROM test_time;
+
+# Testing if the above queries are logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+
+# ####################################################################################################
+# DATETIME
+# ####################################################################################################
+
+--echo #DATETIME
+CREATE TABLE test_datetime (type DATETIME);
+--echo # Inserting a record with DATETIME value within the range
+INSERT INTO test_datetime VALUES ('1992-07-22 07:50:30');
+INSERT INTO test_datetime VALUES ('2012-09-29 20:49:50');
+--echo # Insertingt a record with DATETIME value on range border
+INSERT INTO test_datetime VALUES ('0001-01-01 00:00:00');
+INSERT INTO test_datetime VALUES ('9999-12-31 23:59:59');
+--echo # Selecting the record
+SELECT type FROM test_datetime WHERE (EXTRACT(year FROM type) == 1992);
+SELECT type FROM test_datetime WHERE (HOUR(type) == 07);
+--echo # Deleting the record
+DELETE FROM test_datetime WHERE (EXTRACT(year FROM type) == 2012);
+DELETE FROM test_datetime WHERE (MINUTE(type) == 50);
+--echo # Selecting the records ; this should return 2 records
+SELECT * FROM test_datetime;
+
+
+# Testing if the above queries are logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+
+# ####################################################################################################
+# TIMESTAMP(6)
+# ####################################################################################################
+
+--echo #TIMESTAMP(6)
+CREATE TABLE test_timestamp (type TIMESTAMP(6));
+--echo # Inserting a record with TIMESTAMP value within the range
+INSERT INTO test_timestamp VALUES ('1992-07-22 07:50:23.324543');
+INSERT INTO test_timestamp VALUES ('2012-09-29 23:12:20.232109');
+--echo # Inserting a record with TIMESTAMP value on range border
+INSERT INTO test_timestamp VALUES ('1970-01-01 00:00:01.000000');
+INSERT INTO test_timestamp VALUES ('2038-01-19 03:14:07.999999');
+--echo # Selecting the record
+SELECT type FROM test_timestamp WHERE (EXTRACT(year FROM type) == 1970);
+SELECT type FROM test_timestamp WHERE (HOUR(type) == 03);
+--echo # Deleting the record
+DELETE FROM test_timestamp WHERE (EXTRACT(year FROM type) == 1992);
+DELETE FROM test_timestamp WHERE (MINUTE(type) == 12);
+--echo # Selecting the records ; this should return 2 records
+SELECT * FROM test_timestamp;
+
+
+# Testing if the above queries are logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+
+# ####################################################################################################
+# Cleaning up
+# ####################################################################################################
+--echo cleaning up...
+SET GLOBAL logging_query_enable=false;
+DROP SCHEMA Test;
+--exec rm $DRIZZLETEST_VARDIR/logging_query.log
+--echo ***done***
+
+# ####################################################################################################
+# Done
+# ####################################################################################################

=== added file 'plugin/logging_query/tests/t/datatypes_numeric.test'
--- plugin/logging_query/tests/t/datatypes_numeric.test	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/t/datatypes_numeric.test	2012-10-08 20:02:27 +0000
@@ -0,0 +1,126 @@
+
+# ##############################################################################################################################################
+# Test for Drizzle's  datatypes
+# Test whether the logging_query plugin logs each case of the datatype (we enable the plugin throughout the test and check if it logs each case) 
+# cases:
+#      1.Type
+#      2.Range
+#      3.Select, Insert, Delete queries
+# ##############################################################################################################################################
+
+# logging_query plugin is loaded into the system and this checks if the file we passed through the command line is opened or not
+--replace_result $DRIZZLETEST_VARDIR DRIZZLETEST_VARDIR
+eval SET GLOBAL logging_query_filename="$DRIZZLETEST_VARDIR/logging_query.log";
+--exec if [ -f $DRIZZLETEST_VARDIR/logging_query.log ]; then echo "Log file exists"; else echo "Log file does not exist"; fi
+
+# Clearing the log file
+--exec echo "" > $DRIZZLETEST_VARDIR/logging_query.log 
+# Checking if the file is cleared or not
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+# The above command should print 1 indicating that the log file is empty
+
+# ###################################################################################################
+# Preparing the test bed
+# ###################################################################################################
+
+--echo # logging_query plugin is not enabled and hence none of the following queries should be logged
+DROP SCHEMA IF EXISTS Test;
+CREATE SCHEMA Test;
+USE Test;
+
+--echo # Enabling the logging_query plugin
+SET GLOBAL logging_query_enable=true;
+
+# ####################################################################################################
+# INTEGER
+# ####################################################################################################
+
+--echo #INTEGER
+CREATE TABLE test_integer (type INTEGER);
+--echo # Inserting a record with INTEGER value within range
+INSERT INTO test_integer VALUES (2147483645);
+INSERT INTO test_integer VALUES (-2147483645);
+--echo # Inserting a record with INTEGER value on range borders
+INSERT INTO test_integer VALUES (2147483647);
+INSERT INTO test_integer VALUES (-2147483648);
+--echo # Selecting the record from table
+SELECT type FROM test_integer WHERE type > 0;
+SELECT type FROM test_integer WHERE type < 0;
+--echo # Deleting a record from table
+DELETE FROM test_integer WHERE type > 0;
+--echo # This SELECT should return only two records
+SELECT * FROM test_integer;
+--echo # Deleting a record from table
+DELETE FROM test_integer WHERE type < 0;
+--echo # This SELECT should return a NULL set
+SELECT * FROM test_integer;
+
+# Testing if the above queries are logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+
+# ####################################################################################################
+# BIGINT
+# ####################################################################################################
+
+--echo #BIGINT
+CREATE TABLE test_bigint (type BIGINT);
+--echo # Inserting a record with BIGINT value within range
+INSERT INTO test_bigint VALUES (9223372036854775805);
+INSERT INTO test_bigint VALUES (-9223372036854775805);
+--echo # Inserting a record with BIGINT value on range borders
+INSERT INTO test_bigint VALUES (9223372036854775807);
+INSERT INTO test_bigint VALUES (-9223372036854775808);
+--echo # Selecting the record from table
+SELECT type FROM test_bigint WHERE type > 0;
+SELECT type FROM test_bigint WHERE type < 0;
+--echo # Deleting a record from table
+DELETE FROM test_bigint WHERE type > 0;
+--echo # This SELECT should return only two records
+SELECT * FROM test_bigint;
+--echo # Deleting a record from table
+DELETE FROM test_bigint WHERE type < 0;
+--echo # This SELECT should return a NULL set
+SELECT * FROM test_bigint;
+
+# Testing if the above queries are logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+
+# ####################################################################################################
+# DOUBLE 
+# ####################################################################################################
+
+--echo #DOUBLE
+CREATE TABLE test_double (type DOUBLE);
+--echo #Inserting a record with DOUBLE value within range
+INSERT INTO test_double VALUES (-1.7976931348623155E+308);
+INSERT INTO test_double VALUES (1.7976931348623157E+308);
+--echo # Selecting the record from table
+SELECT type FROM test_double WHERE type > 0;
+SELECT type FROM test_double WHERE type < 0;
+--echo # Deleting a record from table
+DELETE FROM test_double WHERE type > 0;
+--echo # This SELECT should return only one record
+SELECT * FROM test_double;
+--echo # Deleting a record from table
+DELETE FROM test_double WHERE type < 0;
+--echo # This SELECT should return a NULL set
+SELECT * FROM test_double;
+
+# Testing if the above queries are logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+
+# ####################################################################################################
+# Cleaning up
+# ####################################################################################################
+--echo cleaning up...
+SET GLOBAL logging_query_enable=false;
+DROP SCHEMA Test;
+--exec rm $DRIZZLETEST_VARDIR/logging_query.log
+--echo ***done***
+
+# ####################################################################################################
+# Done
+# ####################################################################################################

=== added file 'plugin/logging_query/tests/t/datatypes_string.test'
--- plugin/logging_query/tests/t/datatypes_string.test	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/t/datatypes_string.test	2012-10-08 20:02:27 +0000
@@ -0,0 +1,111 @@
+
+# ##############################################################################################################################################
+# Test for Drizzle's  datatypes
+# Test whether the logging_query plugin logs each case of the datatype (we enable the plugin throughout the test and check if it logs each case) 
+# cases:
+#      1.Type
+#      2.Range
+#      3.Select, Insert, Delete queries
+# ##############################################################################################################################################
+
+# logging_query plugin is loaded into the system and this checks if the file we passed through the command line is opened or not
+--replace_result $DRIZZLETEST_VARDIR DRIZZLETEST_VARDIR
+eval SET GLOBAL logging_query_filename="$DRIZZLETEST_VARDIR/logging_query.log";
+--exec if [ -f $DRIZZLETEST_VARDIR/logging_query.log ]; then echo "Log file exists"; else echo "Log file does not exist"; fi
+
+# Clearing the log file
+--exec echo "" > $DRIZZLETEST_VARDIR/logging_query.log
+# Checking if the file is cleared or not
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+# The above command should print 1 indicating that the log file is empty
+
+# ###################################################################################################
+# Preparing the test bed
+# ###################################################################################################
+
+--echo # logging_query plugin is not enabled and hence none of the following queries should be logged
+DROP SCHEMA IF EXISTS Test;
+CREATE SCHEMA Test;
+USE Test;
+
+--echo # Enabling the logging_query plugin
+SET GLOBAL logging_query_enable=true;
+
+# ###################################################################################################
+# VARCHAR
+# ###################################################################################################
+
+--echo #VARCHAR
+CREATE TABLE test_varchar (type VARCHAR(10));
+--echo # Inserting a record with VARCHAR length within range
+INSERT INTO test_varchar VALUES ('varchar');
+INSERT INTO test_varchar VALUES ('sql');
+--echo # Inserting a record with VARCHAR length on range borders
+INSERT INTO test_varchar VALUES ('drizzle-DB');
+INSERT INTO test_varchar VALUES ('');
+--echo # Selecting records from table
+SELECT type FROM test_varchar WHERE LENGTH(type) = 3;
+SELECT type FROM test_varchar WHERE LENGTH(type) = 0;
+--echo # Deleting records
+DELETE FROM test_varchar WHERE type LIKE REVERSE('rahcrav');
+DELETE FROM test_varchar WHERE type LIKE SUBSTRING('mysql',3);
+--echo # Selecting records from table ; this should return 2 rows
+SELECT * FROM test_varchar;
+
+
+# Testing if the above queries are logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+
+
+# ####################################################################################################
+# ENUM
+# ####################################################################################################
+
+--echo #ENUM
+CREATE TABLE test_enum (type ENUM('one','two','three','four','five','six','seven','eight','nine','ten'));
+--echo # Inserting a record with ENUM value within range
+INSERT INTO test_enum VALUES (3);
+INSERT INTO test_enum VALUES (7);
+--echo # Inserting a record with ENUM value on range border
+INSERT INTO test_enum VALUES (1);
+INSERT INTO test_enum VALUES (9);
+--echo # Selecting records from table
+SELECT type FROM test_enum WHERE type > 5;
+SELECT type FROM test_enum WHERE type < 5;
+--echo # Deleting records
+DELETE FROM test_enum WHERE type = 9;
+DELETE FROM test_enum WHERE type > 1;
+--echo # Selecting records from table ; this should return 1 row
+SELECT * FROM test_enum;
+
+
+# Testing if the above queries are logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+
+
+# ####################################################################################################
+# Cleaning up
+# ####################################################################################################
+--echo cleaning up...
+SET GLOBAL logging_query_enable=false;
+DROP SCHEMA Test;
+--exec rm $DRIZZLETEST_VARDIR/logging_query.log
+--echo ***done***
+
+# ####################################################################################################
+# Done
+# ####################################################################################################
+
+
+
+
+
+
+
+
+
+
+
+

=== added file 'plugin/logging_query/tests/t/delete.test'
--- plugin/logging_query/tests/t/delete.test	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/t/delete.test	2012-10-08 20:02:27 +0000
@@ -0,0 +1,152 @@
+
+# #############################################################################################
+# This tests the logging_query plugin for delete, truncate and drop statements
+# #############################################################################################
+
+# logging_query plugin is loaded into the system. This checks if the file passed through the command line argument is opened or not
+--replace_result $DRIZZLETEST_VARDIR DRIZZLETEST_VARDIR
+eval SET GLOBAL logging_query_filename="$DRIZZLETEST_VARDIR/logging_query.log";
+--exec if [ -f $DRIZZLETEST_VARDIR/logging_query.log ]; then echo "Log file exists"; else echo "Log file does not exist"; fi
+
+# Clearing the log file
+--exec echo "" > $DRIZZLETEST_VARDIR/logging_query.log
+# Checking if the log file is cleared
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+# The above command should print 1 indicating the log file is empty
+
+# #############################################################################################
+# Preparing the test bed
+# #############################################################################################
+--echo Preparing the test bed...
+
+--echo # The logging_query plugin is not yet enabled and hence none of the queries in the prepare phase should be logged
+DROP SCHEMA IF EXISTS Test_Delete;
+CREATE SCHEMA Test_Delete;
+DROP SCHEMA IF EXISTS Test_Truncate;
+CREATE SCHEMA Test_Truncate;
+DROP SCHEMA IF EXISTS Test_Drop;
+CREATE SCHEMA Test_Drop;
+--echo # Preparing test bed for DELETE test
+USE Test_Delete;
+CREATE TABLE test_delete_1 ( test_id INT, test_name CHAR(10) );
+INSERT INTO test_delete_1  VALUES (1,"create"),(2,"select"),(3,"insert"),(4,"update"),(5,"delete");
+CREATE TABLE test_delete_2 ( test_id INT, test_name VARCHAR(10) );
+INSERT INTO test_delete_1 VALUES (1,"create"),(2,"select"),(3,"insert"),(4,"update"),(5,"delete");
+--echo # Preparing test bed for TRUNCATE test
+USE Test_Truncate;
+CREATE TABLE test_truncate_1 ( test_id INT, test_name CHAR(10) );
+INSERT INTO test_truncate_1 VALUES (1,"create"),(2,"select"),(3,"insert"),(4,"update"),(5,"delete");
+CREATE TABLE test_truncate_2 ( test_id INT, test_name CHAR(10) );
+INSERT INTO test_truncate_2 VALUES (1,"create"),(2,"select"),(3,"insert"),(4,"update"),(5,"delete");
+--echo # Preparing test bed for DROP test
+USE Test_Drop;
+CREATE TABLE test_drop ( test_id INT, test_name CHAR(10) );
+CREATE INDEX index_id ON test_drop ( test_id );
+INSERT INTO test_drop VALUES (1,"create"),(2,"select"),(3,"insert"),(4,"update"),(5,"delete");
+
+--echo # This should print 1 indicating that, the log file is still empty
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+
+
+--echo # enabling the logging_query plugin
+SET GLOBAL logging_query_enable=true;
+--echo # Now the tests begin!!!
+
+# #############################################################################################
+# Test: DELETE
+# #############################################################################################
+--echo DELETE test in progress...
+USE Test_Delete;
+
+--echo # The following 2 queries should be logged
+DELETE FROM test_delete_1;
+--echo # The following query should return a null set
+SELECT * FROM test_delete_1;
+
+--echo # enabling the logging_query plugin to log only DELETE queries
+SET GLOBAL logging_query_pcre="DELETE.+";
+
+--echo # The following DELETE queries should be logged
+DELETE FROM test_delete_2 WHERE test_id = 1;
+DELETE FROM test_delete_2 WHERE test_name = "select";
+--echo # The following query should select only tuples with id = (3,4,5) and this query should not be logged
+SELECT * FROM test_delete_2;
+
+--echo # enabling the logging_query plugin to log SELECT queries
+SET GLOBAL logging_query_pcre="SELECT.+";
+
+--echo # The following DELETE query should not be logged
+DELETE FROM test_delete_2;
+--echo # The following SELECT query should return a null set and should be logged
+SELECT * FROM test_delete_2;
+
+--echo # Delete test is completed. Now checking the logging_query.log file. This should print 10
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+
+# #############################################################################################
+# Test: TRUNCATE
+# #############################################################################################
+--echo TRUNCATE test in progress...
+USE Test_Truncate;
+
+--echo # enabling the logging_query plugin to log TRUNCATE queries
+SET GLOBAL logging_query_pcre="TRUNCATE.+";
+
+--echo # The following TRUNCATE query should be logged
+TRUNCATE TABLE test_truncate_1;
+--echo # This SELECT query should not be logged ; this should return a null set
+SELECT * FROM test_truncate_1;
+
+--echo # enabling the logging_query plugin to log RENAME query
+SET GLOBAL logging_query_pcre="RENAME.+";
+
+--echo # The following RENAME query should be logged
+RENAME TABLE test_truncate_2 TO test_truncate;
+--echo # This TRUNCATE query should not be logged
+TRUNCATE TABLE test_truncate;
+--echo # This SELECT query should not be logged ; this should return a null set
+SELECT * FROM test_truncate;
+
+--echo # Truncate test is completed. Now checking the logging_query.log file. This should print 14
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+
+# #############################################################################################
+# Test: Drop
+# #############################################################################################
+--echo DROP test in progress...
+USE Test_Drop;
+
+--echo # enabling the logging_query plugin to log DROP queries
+SET GLOBAL logging_query_pcre="DROP.+";
+
+--echo # dropping an index ; this query should be logged since it is a DROP query ( though implemented through ALTER query )
+ALTER TABLE test_drop DROP INDEX index_id;
+
+--echo # dropping a table  ; this query should be logged
+DROP TABLE test_drop;
+
+--echo # dropping a schema ; this query should be logged
+DROP SCHEMA Test_Drop;
+
+--echo # Drop test is completed. Now checking the logging_query.log file. This should print 18
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+
+# #############################################################################################
+# Cleaning up
+# #############################################################################################
+--echo cleaning up...
+SET GLOBAL logging_query_enable=false;
+SET GLOBAL logging_query_pcre=".+";
+DROP SCHEMA IF EXISTS Test_Delete;
+DROP SCHEMA IF EXISTS Test_Truncate;
+DROP SCHEMA IF EXISTS Test_Drop;
+--exec rm $DRIZZLETEST_VARDIR/logging_query.log
+--echo ***done***
+
+# #############################################################################################
+# Done
+# #############################################################################################

=== removed file 'plugin/logging_query/tests/t/file.bak'
--- plugin/logging_query/tests/t/file.bak	2012-09-30 18:45:40 +0000
+++ plugin/logging_query/tests/t/file.bak	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-
-# ###########################################################################
-# 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/file.test'
--- plugin/logging_query/tests/t/file.test	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/t/file.test	2012-10-08 20:02:27 +0000
@@ -0,0 +1,92 @@
+
+# ###################################################################################
+# 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
+eval SET GLOBAL logging_query_filename="$DRIZZLETEST_VARDIR/logging_query.log";
+--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
+
+--echo # 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%";
+
+--echo #This should not print anything
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+--echo #Enabling logging_query plugin
+SET GLOBAL logging_query_enable=true;
+
+--echo #Now as logging_query_enable is set to true, this should be logged.
+SELECT 1;
+
+--echo #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
+
+--echo #Setting logging_query_pcre as "SHOW.+". Only queries starting with 'SHOW' will be logged from now.
+SET GLOBAL logging_query_pcre="SHOW.+";
+
+--echo #This should not be logged
+SELECT @@logging_query_enable;
+
+--echo #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 
+
+--echo #This should be logged
+SHOW VARIABLES WHERE Variable_Name NOT LIKE "%logging_query_filename%" AND Variable_Name LIKE "%logging_query%";
+
+--echo #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
+
+--echo #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
+
+--echo # Clear log file.
+--exec echo "" > $DRIZZLETEST_VARDIR/logging_query1.log
+
+--echo # Double-check that log file is clear.
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query1.log
+
+--echo #This should not be logged. Neither into new log file. Nor into new log file.
+SELECT @@logging_query_enable;
+
+--echo #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
+
+--echo #This should be logged into new log file
+SHOW VARIABLES WHERE Variable_Name NOT LIKE "%logging_query_filename%" AND Variable_Name LIKE "%logging_query%";
+
+--echo #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
+
+--echo #Changing log file to null string. This should throw error.
+--error ER_WRONG_ARGUMENTS
+eval SET GLOBAL logging_query_filename="";
+
+# ###################################################################################
+# Clean up
+# ###################################################################################
+--echo cleaning up...
+SET GLOBAL logging_query_enable=false;
+SET GLOBAL logging_query_pcre="*";
+--replace_result $DRIZZLETEST_VARDIR DRIZZLETEST_VARDIR
+eval SET GLOBAL logging_query_filename="$DRIZZLETEST_VARDIR/logging_query.log";
+--exec rm $DRIZZLETEST_VARDIR/logging_query.log
+--echo ***done***
+
+# ###################################################################################
+# Done.
+# ###################################################################################
+

=== added file 'plugin/logging_query/tests/t/insert.test'
--- plugin/logging_query/tests/t/insert.test	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/t/insert.test	2012-10-08 20:02:27 +0000
@@ -0,0 +1,87 @@
+
+# ####################################################################################################
+# This tests the logging_query plugin for various insert statements
+# ####################################################################################################
+
+# 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
+eval SET GLOBAL logging_query_filename="$DRIZZLETEST_VARDIR/logging_query.log";
+--exec if [ -f $DRIZZLETEST_VARDIR/logging_query.log ]; then echo "Log file exists"; else echo "Log file does not exist"; fi
+
+# Clearing the log file
+--exec echo "" > $DRIZZLETEST_VARDIR/logging_query.log
+# Checking if the log file is cleared
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+# The above command should print 1 to indicate the log file is empty
+
+# ####################################################################################################
+# Preparing the test bed
+# ####################################################################################################
+--echo preparing the test bed...
+
+--echo # The logging_query plugin is not enabled and hence the following queries should not be logged
+DROP SCHEMA IF EXISTS Test;
+CREATE SCHEMA Test;
+USE Test;
+CREATE TABLE test_info (test_id INT, test_name VARCHAR(10));
+INSERT INTO test_info (test_id,test_name) VALUES (0,null);
+--echo # This should  print 1 indicating the log file is still empty
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+--echo 
+
+--echo # Now the test begins!!!
+--echo # Enabling the logging_query plugin
+SET GLOBAL logging_query_enable=true;
+
+--echo # The following queries should be logged
+INSERT INTO test_info (test_id) VALUES (1);
+INSERT INTO test_info (test_id,test_name) VALUES (1,"create");
+INSERT INTO test_info VALUES (2,"select");
+SELECT * FROM test_info;
+--echo # This should print 6 indicating that, all of the above queries are logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+--echo # Enabling the logging_query plugin to log only INSERT queries
+SET GLOBAL logging_query_pcre="INSERT.+";
+
+--echo # The following INSERT query should be logged
+INSERT INTO test_info (test_id,test_name) VALUES (3,"insert");
+INSERT INTO test_info VALUES (4,"drop"),(5,"delete");
+SELECT test_name FROM test_info;
+DELETE FROM test_info WHERE test_id = 0;
+SELECT * FROM test_info;
+--echo # This should print 9 indicating that, only the INSERT queries were logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+--echo # Enabling the logging_query plugin to log SELECT queries
+SET GLOBAL logging_query_pcre="SELECT.+";
+
+--echo # The following INSERT queries should NOT be logged
+INSERT INTO test_info VALUES (5,"delete");
+SELECT test_name AS tests FROM test_info;
+SELECT * FROM test_info WHERE test_id > 3;
+--echo # This should print 12 indicating that, the INSERT query is NOT logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+--echo # Enabling the logging_query plugin to log DELETE queries
+SET GLOBAL logging_query_pcre="DELETE.+";
+
+--echo # The following INSERT queries should NOT be logged
+INSERT INTO test_info VALUES (6,""),(7,"enums");
+DELETE FROM test_info WHERE test_id=6 OR 7;
+--echo # This should print 14 indicating that, the INSERT query is NOT Logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+
+# ####################################################################################################
+# Cleaning up
+# ####################################################################################################
+--echo cleaning up...
+SET GLOBAL logging_query_enable=false;
+SET GLOBAL logging_query_pcre=".+";
+DROP SCHEMA Test;
+--exec rm $DRIZZLETEST_VARDIR/logging_query.log
+--echo ***done***
+
+# ####################################################################################################
+# Done
+# ####################################################################################################

=== added file 'plugin/logging_query/tests/t/select.test'
--- plugin/logging_query/tests/t/select.test	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/t/select.test	2012-10-08 20:02:27 +0000
@@ -0,0 +1,128 @@
+
+# ##################################################################################
+# This tests the logging_query plugin for various select instances
+# ##################################################################################
+
+# 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
+eval SET GLOBAL logging_query_filename="$DRIZZLETEST_VARDIR/logging_query.log";
+--exec if [ -f $DRIZZLETEST_VARDIR/logging_query.log ]; then echo "Log file exists"; else echo "Log file does not exist"; fi
+
+# Clearing the log file
+--exec echo "" > $DRIZZLETEST_VARDIR/logging_query.log
+# Checking if the log file is cleared 
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+# The above command should print 1 to indicate that the log file is empty
+
+# ##################################################################################
+# Preparing the test bed
+# ##################################################################################
+--echo Preparing the test bed...
+CREATE SCHEMA Select_Test;
+USE Select_Test;
+CREATE TABLE select_test_1 (id INT, type CHAR(20));
+INSERT INTO select_test_1 VALUES (1,"basic select"),(2,"select distinct"),(3,"select with where"),(4,"select with orderby");
+CREATE TABLE select_test_2 (id INT, time FLOAT);
+INSERT INTO select_test_2 VALUES (1,10.01),(2,9.38),(3,5.6),(4,6.7);
+--echo prepare phase completed...
+--echo
+
+# ###################################################################################
+# Basic SELECT queries
+# ###################################################################################
+--echo Testing basic select queries. 
+--echo # The logging_query is not enabled and hence the following select queries should not be logged
+SELECT 1;
+SELECT "logging_query";
+--echo # This should print 1 to indicate the log file is still empty
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+--echo 
+
+--echo # Enabling the logging_query plugin
+SET GLOBAL logging_query_enable=true;
+--echo 
+
+--echo # The logging_query is enabled and the following select query should be logged
+SELECT 1;
+--echo # This should print 3 indicating that the above query is logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+--echo # Issuing another select query
+SELECT "hello world";
+--echo # This should print 4 indicating that the above query is logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+--echo 
+
+--echo # Enabling the logging_query to log only SHOW queries
+SET GLOBAL logging_query_pcre="SHOW.+";
+--echo 
+
+--echo # The following query should be logged
+SHOW VARIABLES WHERE Variable_Name NOT LIKE "%logging_query_filename%" AND Variable_Name LIKE "%logging_query%";
+--echo # This should print 6 indicating that the above query is logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+--echo 
+
+--echo # The following select query should not be logged
+SELECT 1;
+--echo # This should print 4 indicating that the above query is not logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+--echo # Basic test completed...
+--echo 
+
+
+--echo drilling the SELECT queries test.
+--echo # Enabling the logging_query plugin to log SELECT queries 
+--echo # ( since here after, the test deals with variants of SELECT queries and all such should be checked against logging)
+SET GLOBAL logging_query_pcre="SELECT.+";
+--echo
+
+# ##################################################################################
+# SELECT with DISTINCT
+# ##################################################################################
+--echo # Testing for select with distinct
+--echo # The following queries should be logged
+SELECT DISTINCT * FROM select_test_1;
+SELECT DISTINCT * FROM select_test_2;
+--echo # This should print 9 indicating that the above queries are logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+--echo
+
+# ##################################################################################
+# SELECT with WHERE
+# ##################################################################################
+--echo # Testing for select with where
+--echo # The following queries should be logged
+SELECT * FROM select_test_1 WHERE id = 2;
+SELECT * FROM select_test_1 WHERE type = "select with where";
+SELECT time FROM select_test_2 WHERE id >= 2;
+SELECT id FROM select_test_2 WHERE time < 6;
+--echo # This should print 13 indicating that the above queries are logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+--echo
+
+# ##################################################################################
+# SELECT with ORDER BY
+# ##################################################################################
+--echo # Testing for select with order by
+--echo # The following queries should be logged
+SELECT * FROM select_test_2 ORDER BY id DESC;
+SELECT time FROM select_test_2 ORDER BY time;
+SELECT id FROM select_test_2 ORDER BY time DESC;
+--echo # This should print 16 indicating all the above queries are logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+--echo
+
+
+# ##################################################################################
+# Cleaning up
+# ##################################################################################
+--echo cleaning up...
+DROP SCHEMA Select_Test;
+SET GLOBAL logging_query_enable=false;
+SET GLOBAL logging_query_pcre=".+";
+--exec rm $DRIZZLETEST_VARDIR/logging_query.log
+--echo ***done***
+
+# ##################################################################################
+# Done
+# ##################################################################################

=== removed file 'plugin/logging_query/tests/t/thresholds.bak'
--- plugin/logging_query/tests/t/thresholds.bak	2012-09-30 21:58:50 +0000
+++ plugin/logging_query/tests/t/thresholds.bak	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-
-# ###########################################################################
-# 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.
-# ###########################################################################

=== 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-10-08 20:02:27 +0000
@@ -0,0 +1,91 @@
+
+# ###########################################################################
+# 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.
+# ############################################################################
+--echo cleaning up...
+SET GLOBAL logging_query_enable=false;
+SET GLOBAL logging_query_pcre=".+";
+--exec rm $DRIZZLETEST_VARDIR/logging_query*.log
+--echo ***done***
+
+# ###########################################################################
+# Done.
+# ###########################################################################

=== added file 'plugin/logging_query/tests/t/update.test'
--- plugin/logging_query/tests/t/update.test	1970-01-01 00:00:00 +0000
+++ plugin/logging_query/tests/t/update.test	2012-10-08 20:02:27 +0000
@@ -0,0 +1,88 @@
+
+# #########################################################################################
+# This tests the logging_query plugin for various update statements
+# #########################################################################################
+
+# The logging_query plugin is loaded into the system. This checks if the file which we sent through the command line is opened or not
+--replace_result $DRIZZLETEST_VARDIR DRIZZLETEST_VARDIR
+eval SET GLOBAL logging_query_filename="$DRIZZLETEST_VARDIR/logging_query.log";
+--exec if [ -f $DRIZZLETEST_VARDIR/logging_query.log ]; then echo "Log file exists"; else echo "Log file does not exist"; fi
+
+# Clearing the log file
+--exec echo "" > $DRIZZLETEST_VARDIR/logging_query.log
+# Checking if the log file is empty or not
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+# The above command should print 1 indicating that the log file is still empty
+
+# #########################################################################################
+# Preparing the test bed
+# #########################################################################################
+--echo preparing the test bed...
+
+--echo # The logging_query plugin is not enabled and hence none of the queries in prepare phase should be logged
+CREATE SCHEMA Test_Update;
+USE Test_Update;
+CREATE TABLE test_info (id INT, name CHAR(10));
+INSERT INTO test_info VALUES (1,"create"),(2,"select"),(3,"insert"),(4,"update"),(5,"delete");
+--echo # This should print 1 indicating that the log file is still empty
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+--echo
+
+# #########################################################################################
+# UPDATE test
+# #########################################################################################
+--echo UPDATE test in progress...
+
+--echo # The logging_query plugin is not enabled and the following update query should not be logged
+UPDATE test_info SET name="CREATE" WHERE id=1;
+--echo # This should print 1 indicating that the log file is still empty
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+--echo
+
+--echo # Enabling the logging_query plugin
+SET GLOBAL logging_query_enable=true;
+--echo
+
+--echo # The logging_query plugin is enabled and the following update query should be logged
+UPDATE test_info SET name="SELECT" WHERE id=2;
+--echo # This should print 3 indicating that the above query is logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+--echo
+
+--echo # Enabling the logging_query plugin to log only select queries
+SET GLOBAL logging_query_pcre="SELECT.+";
+--echo
+
+--echo # The following UPDATE query should not be logged
+UPDATE test_info SET name="INSERT" WHERE id=3;
+SELECT * FROM test_info;
+--echo # This should print 5 indicating that, only the UPDATE query is NOT logged
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+--echo
+
+--echo # Enabling the logging_query plugin to log UPDATE queries 
+SET GLOBAL logging_query_pcre="UPDATE.+";
+--echo
+
+--echo # The followihng UPDATE query should be logged
+UPDATE test_info SET name="UPDATE" WHERE id=6;
+--echo # The above query will not update the table since a tuple with id=6 does not exist
+SELECT * FROM test_info;
+--echo # This should print 7 indicating that, only the UPDATE query is logged and not the select query
+--exec $TOP_SRCDIR/plugin/logging_query/tests/parse-query-log.sh $DRIZZLETEST_VARDIR/logging_query.log
+--echo
+
+# #########################################################################################
+# Clean up
+# #########################################################################################
+--echo cleaning up...
+SET GLOBAL logging_query_enable=false;
+SET GLOBAL logging_query_pcre=".+";
+DROP SCHEMA Test_Update;
+--exec rm $DRIZZLETEST_VARDIR/logging_query.log
+--echo ***done***
+
+# #########################################################################################
+# Done
+# #########################################################################################
+