From: Marc Alff
Date: September 2 2010 1:51am
Subject: bzr push into mysql-next-mr-bugfixing branch (marc.alff:3270 to 3271)
List-Archive: http://lists.mysql.com/commits/117384
Message-Id: <20100902015122.E793445E81@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2388669859682262601=="

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

 3271 Marc Alff	2010-09-01 [merge]
      Merge mysql-trunk-bugfixing --> mysql-next-mr-bugfixing

    modified:
      mysys/my_getopt.c
 3270 Alexey Botchkov	2010-09-01 [merge]
      merging.

    modified:
      libmysqld/Makefile.am
=== modified file 'mysys/my_getopt.c'
--- a/mysys/my_getopt.c	2010-08-26 15:23:47 +0000
+++ b/mysys/my_getopt.c	2010-09-02 01:50:32 +0000
@@ -163,7 +163,6 @@ int handle_options(int *argc, char ***ar
   int error, i;
   my_bool is_cmdline_arg= 1;
 
-  LINT_INIT(opt_found);
   /* handle_options() assumes arg0 (program name) always exists */
   DBUG_ASSERT(argc && *argc >= 1);
   DBUG_ASSERT(argv && *argv);
@@ -188,6 +187,7 @@ int handle_options(int *argc, char ***ar
   {
     char **first= pos;
     char *cur_arg= *pos;
+    opt_found= 0;
     if (!is_cmdline_arg && (cur_arg == args_separator))
     {
       is_cmdline_arg= 1;


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///home/malff/BZR_TREE/mysql-next-mr-bugfixing-\
#   merge/
# testament_sha1: 2d24376a88bf1b4cba72d3a5e88db41918e9caee
# timestamp: 2010-09-01 19:51:22 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing/
# base_revision_id: holyfoot@stripped
# 
# Begin bundle
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
FCQoWVxzQA==


--===============2388669859682262601==--