bzr push into mysql-trunk-merge branch (Georgi.Kodinov:3160 to 3161)

[Georgi Kodinov]

 3161 Georgi Kodinov	2010-08-03 [merge]
      merge

    modified:
      include/mysql/plugin.h
      mysql-test/t/disabled.def
      mysys/my_getopt.c
      storage/example/ha_example.cc
 3160 Dao-Gang.Qu@stripped	2010-08-03 [merge]
      Bug #34283  	mysqlbinlog leaves tmpfile after termination if binlog contains load data infile
      
      Post fix
     @ mysql-test/t/mysqlbinlog.test
        Updated for Bug#34283

    modified:
      mysql-test/t/mysqlbinlog.test
=== modified file 'include/mysql/plugin.h'
--- a/include/mysql/plugin.h	2010-04-29 20:33:06 +0000
+++ b/include/mysql/plugin.h	2010-08-03 16:21:13 +0000
@@ -327,7 +327,7 @@ DECLARE_MYSQL_SYSVAR_SIMPLE(name, unsign
   #name, comment, check, update, &varname, def, min, max, blk }
 
 #define MYSQL_SYSVAR_ENUM(name, varname, opt, comment, check, update, def, typelib) \
-DECLARE_MYSQL_SYSVAR_TYPELIB(name, unsigned long) = { \
+DECLARE_MYSQL_SYSVAR_TYPELIB(name, unsigned int) = { \
   PLUGIN_VAR_ENUM | ((opt) & PLUGIN_VAR_MASK), \
   #name, comment, check, update, &varname, def, typelib }
 

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2010-06-30 09:27:38 +0000
+++ b/mysql-test/t/disabled.def	2010-08-03 16:21:13 +0000
@@ -13,7 +13,6 @@ kill                     : Bug#37780 200
 lowercase_table3         : Bug#54845 2010-06-30 alik main.lowercase_table3 on Mac OSX
 mysqlhotcopy_myisam      : bug#54129 2010-06-04 Horst
 mysqlhotcopy_archive     : bug#54129 2010-06-04 Horst
-plugin_load              : Bug#42144 2009-12-21 alik plugin_load fails
 partition_innodb_plugin  : Bug#53307 2010-04-30 VasilDimov valgrind warnings
 query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
 sp_sync                  : Bug#48157 2010-02-06 5.5-m3 demands a differnt solution

=== modified file 'mysys/my_getopt.c'
--- a/mysys/my_getopt.c	2010-07-15 17:45:08 +0000
+++ b/mysys/my_getopt.c	2010-08-03 16:21:13 +0000
@@ -603,18 +603,24 @@ static int setval(const struct my_option
       };
       break;
     case GET_ENUM:
-      if (((*(uint*)value)=
-             find_type(argument, opts->typelib, 2) - 1) == (uint)-1)
       {
-        /* Accept an integer representation of the enumerated item */
-        char *endptr;
-        uint arg= (uint) strtol(argument, &endptr, 10);
-        if (*endptr || arg >= opts->typelib->count)
+        int type= find_type(argument, opts->typelib, 2);
+        if (type == 0)
         {
-          res= EXIT_ARGUMENT_INVALID;
-          goto ret;
-        };
-        *(uint*)value= arg;
+          /*
+            Accept an integer representation of the enumerated item.
+          */
+          char *endptr;
+          uint arg= (uint) strtoul(argument, &endptr, 10);
+          if (*endptr || arg >= opts->typelib->count)
+          {
+            res= EXIT_ARGUMENT_INVALID;
+            goto ret;
+          }
+          *(uint*)value= arg;
+        }
+        else
+          *(uint*)value= type - 1;
       }
       break;
     case GET_SET:

=== modified file 'storage/example/ha_example.cc'
--- a/storage/example/ha_example.cc	2010-07-20 19:30:10 +0000
+++ b/storage/example/ha_example.cc	2010-08-03 16:21:13 +0000
@@ -912,7 +912,7 @@ int ha_example::create(const char *name,
 struct st_mysql_storage_engine example_storage_engine=
 { MYSQL_HANDLERTON_INTERFACE_VERSION };
 
-static ulong srv_enum_var= 0;
+static uint srv_enum_var= 0;
 static ulong srv_ulong_var= 0;
 
 const char *enum_var_names[]=


Attachment: [text/bzr-bundle] bzr/[e-mail]