bzr commit into mysql-trunk branch (Georgi.Kodinov:3299)

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/work/test-trunk/ based on revid:georgi.kodinov@stripped

 3299 Georgi Kodinov	2011-03-18 [merge]
      merge

    modified:
      mysql-test/include/have_plugin_auth.inc
      mysql-test/t/mysql_client_test-master.opt
      mysql-test/t/mysql_client_test.test
=== modified file 'mysql-test/include/have_plugin_auth.inc'
--- a/mysql-test/include/have_plugin_auth.inc	2010-08-09 08:32:50 +0000
+++ b/mysql-test/include/have_plugin_auth.inc	2011-03-18 09:31:39 +0000
@@ -2,3 +2,4 @@ disable_query_log;
 --require r/true.require
 select (PLUGIN_LIBRARY LIKE 'auth_test_plugin%') as `TRUE` FROM INFORMATION_SCHEMA.PLUGINS 
   WHERE PLUGIN_NAME='test_plugin_server';
+enable_query_log;

=== modified file 'mysql-test/t/mysql_client_test-master.opt'
--- a/mysql-test/t/mysql_client_test-master.opt	2010-11-02 11:53:54 +0000
+++ b/mysql-test/t/mysql_client_test-master.opt	2011-03-18 10:21:40 +0000
@@ -1 +1,5 @@
---general-log=1 --general-log-file=$MYSQLTEST_VARDIR/log/master.log --log-output=FILE,TABLE
+--general-log=1 
+--general-log-file=$MYSQLTEST_VARDIR/log/master.log 
+--log-output=FILE,TABLE
+$PLUGIN_AUTH_OPT
+$PLUGIN_AUTH_LOAD

=== modified file 'mysql-test/t/mysql_client_test.test'
--- a/mysql-test/t/mysql_client_test.test	2011-03-17 14:06:30 +0000
+++ b/mysql-test/t/mysql_client_test.test	2011-03-18 10:21:40 +0000
@@ -1,5 +1,7 @@
 # This test should work in embedded server after we fix mysqltest
 -- source include/not_embedded.inc
+# need to have the dynamic loading turned on for the client plugin tests
+--source include/have_plugin_auth.inc
 
 SET @old_general_log= @@global.general_log;
 SET @old_slow_query_log= @@global.slow_query_log;

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).