From: Marc Alff
Date: September 2 2010 1:43am
Subject: bzr push into mysql-trunk-bugfixing branch (marc.alff:3255 to 3256)
List-Archive: http://lists.mysql.com/commits/117382
Message-Id: <20100902014404.B798A45E81@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4090270772195108025=="

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

 3256 Marc Alff	2010-09-01 [merge]
      Merge mysql-5.5-bugfixing --> mysql-trunk-bugfixing

    modified:
      mysys/my_getopt.c
 3255 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 14:54:39 +0000
+++ b/mysys/my_getopt.c	2010-09-02 01:43:11 +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;


--===============4090270772195108025==
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-trunk-bugfixing-\
#   merge/
# testament_sha1: 8fcae98b6abf93aed86d7ebbe4b43b623e0d5217
# timestamp: 2010-09-01 19:44:04 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-5.5-bugfixing/
# base_revision_id: holyfoot@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSLskd4AAxLfgEAQWOf//3IC
AAC////wUAXteYhW3dY3Qo0KJASimhpCeptNqZPQU3qTam1Gj1D1AGgaUepo9TTCnqDRkAAAAABI
oCExTMkbRIPFMmh6IGhoYw0NAAABoAAAAAKlFNNGjIAIwmminiT0mibU9QP1SLY60eo71yNx7jSa
y56DFVy6wVUQzsZdfolOqLWxLpZKN8unWfKOEBjDHj5I/UplBq9rZGFkCDZ5FDLpl6fSmF8hHKxe
MsHEPngwS6qIHadC2SXkxSexUUPe5JixVRzv6s+yveXn6E8l8/Tslx9rGlhwblfM1PTe9UebQw83
holuraRok5rkohwa78Va1y33URrabwbd4+hLAIBNhMBVUAFMTEosUg3qQiAMUwmR91utcOwGS6qC
82JDqKorEY7uy8LCY/3RFmMAo26CjxKgLjU3Bq9pqS0MSxuM+dMZcppzKcX92opWmT3TImpZxXr7
+FWjNKGfPs/GrgU9crQz6dmwzzibHjwqbzFfO8xTOqXFBMRGYxYnmamnwRjm5N0rJU0rtrOdVrrz
cmvXgzDJJ3VjZN6ec6Fuy7abBSEXlMis8NYbkRuhbmSoW6BCf+sEUXoI3jLIuyCnBgzcOi2TVw3T
lY7mm7Cdc23IdDgZtwkwkIaduiIcrRqSlt4xOAkhOwGxn90UnK3Bt2Z388Rdmfw61wvhCUtMaZWh
3qKWslrcFaW7QvEycqyjDHuM52yQqqoQCikIQnazA38ueaAGkQUsSlfI4icvnzRwTKdLd9NqxtS+
/Mad/dfwbZfsKcqFWDEaqpFNcUrwzcjrCNQRLBEK6zmJVLzO5HGEhQ8BkqDYFKBoOMzZaEVdBlhC
heOAqlAMSQMkMTKjmE0qVGS+obzbyLTQ3SbgMOZ5nv6FguAIuLNTGMG36cosi6HelgQJoPHwiFsB
drbtZz9LuavP46fv8kZLueGpjk7kfdtbVi5q/65CE4hzGsExoxQo7abqytd8VHG198mJO0Q8NRyM
Am1eg5OqUI2GzcXm3nty7Lfma+ryy0UI1a7kTatwN9dTft7NnwbNKlcsWptrMabjjh41OqN3Y179
Rmek+kfPdnnzcpvqkdHazgmws8KLPHiey9wyqOClb2WTv74mnxR6n44YeG7A19dC5teVXSmG+A1s
hVPEPXMUME5B5iKJuquOZ2PcYF5GECOx4yXjMmN0dBru8fjjWy0i3pU4nmkajOf8dnvNZ2+6Yp3f
SitnlR9n8KvBuhWuWS055/U5vZYeZXsNNhoeXV4mNLd0dFs3pTW2HQzEyRzDkuvAUg0XxSw8FqG/
77DImWZAPmmePuLuzRGR3cEaWNplTY58asymJu7zFkpSilPCS9iPZH5RzFg0qjyXW0ZyKFH09Ujw
aH8Jmeys/AOj+35UrFFVK9nGO9q962tRvObsyMi0vZTXmsU+ksZM8ocZsSzEULjMqk5EEpnUSiyk
7BEmKpAXdiHGHbdIWiJ3UZIfCmVLZ6yf7+tO0iyTpki/tYnrtkxtzCcndPymHJRRLC3K/fgex92m
3+i5lR8zyRjWmTQjoUanWjyvlJnkT4YwYO7aWn2qKhpHElMc5kBaX/QliVO0MsVmx4GNwEChaZMb
O48BmAi8VupLMe2ZlyzzNqWK8VQmKRNyOE0Iq1tJ7qXLt+DUe2GeRfJhJxZKplV1Ixsdck/W6P59
JoaszZgvvY/GfGCLU1Dc/xka1qtD5d57b4tmWbTTyL085y3Jqj2kuTqn8ozLCdk7S7Sfgwdf/i7k
inChIEXZI7w=


--===============4090270772195108025==--