From: Georgi Kodinov
Date: August 3 2010 4:23pm
Subject: bzr push into mysql-trunk-merge branch (Georgi.Kodinov:3160 to 3161)
List-Archive: http://lists.mysql.com/commits/114956
Message-Id: <20100803162318.772719CEE90@mbpro.gmz>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5576335411889518595=="

--===============5576335411889518595==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 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[]=


--===============5576335411889518595==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/georgi.kodinov@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: georgi.kodinov@stripped\
#   vgw98gu0bjdtz2nb
# target_branch: file:///Users/kgeorge/mysql/work/B42144-trunk-merge/
# testament_sha1: 32b4df0b02a8bcb16156cbbb3f8ad1a6ea77f07f
# timestamp: 2010-08-03 19:23:18 +0300
# source_branch: file:///Users/kgeorge/mysql/work/B42144-5.1-bugteam/
# base_revision_id: dao-gang.qu@stripped\
#   envvwxlci09tye4r
# 
# Begin bundle
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


--===============5576335411889518595==--