From: Mayank Prasad
Date: June 8 2011 6:26am
Subject: bzr commit into mysql-5.5 branch (mayank.prasad:3151) Bug#12561297
List-Archive: http://lists.mysql.com/commits/138819
X-Bug: 12561297
Message-Id: <201106080627.p586R3cl005725@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2070434091=="

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

#At file:///home/mayank/mysql-tree/mydefects/5.5_12561297/ based on revid:mayank.prasad@stripped

 3151 Mayank Prasad	2011-06-08
      BUG#12561297:LIBMYSQLD/EXAMPLE/MYSQL_EMBEDDED IS ABORTING.
      
      Issue:
      When libmysqld/example/mysql_embedded is executed, it was getting abort. Its a
      regression as it was working in 5.1 and failed in 5.5. Issue is there because 
      remaining_argc/remaining_argv were not getting assigned correctly in 
      init_embedded_server() which were being used later in init_common_variable().
      
      Solution:
      Rectified code to pass correct argc/argv to be used in init_common_variable().
     @ libmysqld/lib_sql.cc
        Rectified remaining_argc/remaining_argv assignment.
     @ mysql-test/r/mysql_embedded.result
        Result file for the test case added.
     @ mysql-test/t/mysql_embedded.test
        Added test case to verify libmysqld/example/mysql_embedded works.

    added:
      mysql-test/r/mysql_embedded.result
      mysql-test/t/mysql_embedded.test
    modified:
      libmysqld/lib_sql.cc
=== modified file 'libmysqld/lib_sql.cc'
--- a/libmysqld/lib_sql.cc	2011-05-20 09:18:36 +0000
+++ b/libmysqld/lib_sql.cc	2011-06-08 06:26:44 +0000
@@ -531,8 +531,8 @@ int init_embedded_server(int argc, char 
     return 1;
   defaults_argc= *argcp;
   defaults_argv= *argvp;
-  remaining_argc= argc;
-  remaining_argv= argv;
+  remaining_argc= *argcp;
+  remaining_argv= *argvp;
 
   /* Must be initialized early for comparison of options name */
   system_charset_info= &my_charset_utf8_general_ci;

=== added file 'mysql-test/r/mysql_embedded.result'
--- a/mysql-test/r/mysql_embedded.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/mysql_embedded.result	2011-06-08 06:26:44 +0000
@@ -0,0 +1,5 @@
+#
+# Bug#12561297 : LIBMYSQLD/EXAMPLE/MYSQL_EMBEDDED IS ABORTING.
+#
+1
+1

=== added file 'mysql-test/t/mysql_embedded.test'
--- a/mysql-test/t/mysql_embedded.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/mysql_embedded.test	2011-06-08 06:26:44 +0000
@@ -0,0 +1,6 @@
+--echo #
+--echo # Bug#12561297 : LIBMYSQLD/EXAMPLE/MYSQL_EMBEDDED IS ABORTING.
+--echo #
+
+--source include/is_embedded.inc
+--exec $MYSQL_TEST_DIR/../libmysqld/examples/mysql_embedded -e 'select 1'


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mayank.prasad@stripped\
#   bd3u955l8mnwy29j
# target_branch: file:///home/mayank/mysql-tree/mydefects\
#   /5.5_12561297/
# testament_sha1: c8352e8740766dc17eadd01385d2c5448bba2677
# timestamp: 2011-06-08 11:56:56 +0530
# base_revision_id: mayank.prasad@stripped\
#   om4xc22teyxv3rl7
# 
# Begin bundle
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
yRThQkIDKvFQ


--===============2070434091==--