Merge lp:~hartmut-php/maria/5.5-wl820 into lp:~atcurtis/maria/5.5-wl820

[Hartmut Holzgraefe]

fix for out-of-source CMake builds ... perl_udf.cc is creted in the build dir while perl_init.h is in the source dir, so an extra include path needs to be set for this ...

[Antony T Curtis (atcurtis)]

Please consider adding the following somewhere (maria could benefit from the my_getopt.c patch):

=== modified file 'mysql-test/mysql-test-run.pl'
--- mysql-test/mysql-test-run.pl 2012-07-03 18:50:12 +0000
+++ mysql-test/mysql-test-run.pl 2012-08-24 18:51:03 +0000
@@ -2382,6 +2382,7 @@
   if ($mysql_version_id >= 50100) {
     my $lib_psmexample_plugin=
       mtr_file_exists(vs_config_dirs('plugin/example_udf', 'psm_example.dll'),
+ "$opt_vardir/plugins/psm_example.so",
                       "$basedir/plugin/example_udf/psm_example.so",
                       "$path_plugin_libdir/psm_example.so");
     $ENV{'PSMEXAMPLE_PLUGIN'}=
@@ -2396,6 +2397,7 @@
   if ($mysql_version_id >= 50100) {
     my $lib_psmjava_plugin=
       mtr_file_exists(vs_config_dirs('plugin/java_udf', 'psm_java.dll'),
+ "$opt_vardir/plugins/psm_java.so",
                       "$basedir/plugin/java_udf/psm_java.so",
                       "$path_plugin_libdir/psm_java.so");
     $ENV{'PSMJAVA_PLUGIN'}=
@@ -2411,6 +2413,7 @@
   if ($mysql_version_id >= 50100) {
     my $lib_psmperl_plugin=
       mtr_file_exists(vs_config_dirs('plugin/perl_udf', 'psm_perl.dll'),
+ "$opt_vardir/plugins/psm_perl.so",
                       "$basedir/plugin/perl_udf/psm_perl.so",
                       "$path_plugin_libdir/psm_perl.so");
     $ENV{'PSMPERL_PLUGIN'}=

=== modified file 'mysys/my_getopt.c'
--- mysys/my_getopt.c 2012-01-13 14:50:02 +0000
+++ mysys/my_getopt.c 2012-08-24 18:44:06 +0000
@@ -193,6 +193,14 @@
     char **first= pos;
     char *cur_arg= *pos;
     opt_found= 0;
+ while (cur_arg[0] && my_isspace(&my_charset_latin1, cur_arg[0]))
+ cur_arg++;
+ if (!cur_arg[0])
+ {
+ /* consume empty arguments */
+ (*argc)--;
+ continue;
+ }
     if (!is_cmdline_arg && (my_getopt_is_args_separator(cur_arg)))
     {
       is_cmdline_arg= 1;

review: Approve

=== modified file 'plugin/perl_udf/CMakeLists.txt'
--- plugin/perl_udf/CMakeLists.txt	2012-06-05 21:41:21 +0000
+++ plugin/perl_udf/CMakeLists.txt	2012-08-22 17:53:19 +0000
@@ -19,6 +19,7 @@
 IF(PERL_FOUND)
 
   # Can't use FIND_PACKAGE(PerlLibs) because it is broken
+  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
   EXECUTE_PROCESS(
     COMMAND

=== modified file 'plugin/perl_udf/perl_udf.xs'
--- plugin/perl_udf/perl_udf.xs	2012-06-06 00:12:24 +0000
+++ plugin/perl_udf/perl_udf.xs	2012-08-22 17:53:19 +0000
@@ -29,10 +29,10 @@
 
 #define PERL_NO_GET_CONTEXT
 
-#include "EXTERN.h"
-#include "perl.h"
-#include "XSUB.h"
-#include "perl_init.h"
+#include <EXTERN.h>
+#include <perl.h>
+#include <XSUB.h>
+#include <perl_init.h>
 
 #undef my_vsnprintf
 #undef my_snprintf