bzr push into mysql-trunk branch (vasil.dimov:3383 to 3384)

[vasil.dimov]

 3384 Vasil Dimov	2011-08-18
      Revert vasil.dimov@stripped it is
      suspected for causing crashes and I do not have time right now to look
      at it. Will come back to this after the tree has stabilized.

    modified:
      sql/sql_class.cc
 3383 Georgi Kodinov	2011-08-18
      Bug #11766001: 59026: ALLOW MULTIPLE --PLUGIN-LOAD OPTIONS
      
      Implemented support for a new command line option :
      --plugin-load-add=<comma-separated-name-equals-value-list>
      This option takes the same type of arguments that --plugin-load does
      and complements --plugin-load (that continues to operate as before) by
      appending its argument to the list specified by --plugin-load.
      So --plugin-load can be considered a composite option consisting of 
      resetting the plugin load list and then calling --plugin-load-add to process
      the argument.
      Note that the order in which you specify --plugin-load and --plugin-load-add 
      is important : "--plugin-load=x --plugin-load-add=y" will be equivalent to
      "--plugin-load=x,y" whereas "--plugin-load-add=y --plugin-load=x" will be 
      equivalent to "plugin-load=x".
      
      Incompatible change : the --help --verbose command will no longer print the 
      --plugin-load variable's values (as it doesn't have one). Otherwise both --plugin-load 
      and --plugin-load-add are mentioned in it.
      Added few test cases to test different combinations.
      Added an extension to mysql-test-run.pl to add variables for --plugin-load-add similarly
      to what it does for --plugin-load.
      Moved the includes on top of the files.

    added:
      mysql-test/r/multi_plugin_load.result
      mysql-test/r/multi_plugin_load_add.result
      mysql-test/r/multi_plugin_load_add2.result
      mysql-test/t/multi_plugin_load-master.opt
      mysql-test/t/multi_plugin_load.test
      mysql-test/t/multi_plugin_load_add-master.opt
      mysql-test/t/multi_plugin_load_add.test
      mysql-test/t/multi_plugin_load_add2-master.opt
      mysql-test/t/multi_plugin_load_add2.test
    modified:
      mysql-test/mysql-test-run.pl
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      sql/mysqld.cc
      sql/mysqld.h
      sql/sql_plugin.cc
      sql/sql_plugin.h
=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	revid:georgi.kodinov@stripped
+++ b/sql/sql_class.cc	revid:vasil.dimov@stripped
@@ -666,7 +666,7 @@ char *thd_security_context(THD *thd, cha
 {
   String str(buffer, length, &my_charset_latin1);
   const Security_context *sctx= &thd->main_security_ctx;
-  char header[256];
+  char header[64];
   int len;
   /*
     The pointers thd->query and thd->proc_info might change since they are

No bundle (reason: useless for push emails).