From 34142b84c69fd67e8d50157d9d3356dcef30d154 Mon Sep 17 00:00:00 2001
From: Mayank Prasad <mayank.prasad@oracle.com>
Date: Tue, 14 Jun 2011 00:11:24 +0530
Subject: [PATCH] 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.
---
 libmysqld/lib_sql.cc               | 4 ++--
 mysql-test/r/mysql_embedded.result | 5 +++++
 mysql-test/t/mysql_embedded.test   | 6 ++++++
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 mysql-test/r/mysql_embedded.result
 create mode 100644 mysql-test/t/mysql_embedded.test

diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 34f8f685e45..eed5e90edcd 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -531,8 +531,8 @@ int init_embedded_server(int argc, char **argv, char **groups)
     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;
diff --git a/mysql-test/r/mysql_embedded.result b/mysql-test/r/mysql_embedded.result
new file mode 100644
index 00000000000..3ba79a01e44
--- /dev/null
+++ b/mysql-test/r/mysql_embedded.result
@@ -0,0 +1,5 @@
+#
+# Bug#12561297 : LIBMYSQLD/EXAMPLE/MYSQL_EMBEDDED IS ABORTING.
+#
+1
+1
diff --git a/mysql-test/t/mysql_embedded.test b/mysql-test/t/mysql_embedded.test
new file mode 100644
index 00000000000..b4c8c6be05f
--- /dev/null
+++ b/mysql-test/t/mysql_embedded.test
@@ -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'