From c7c3f5bed8a63ef1b93acf62297bcdc9c6dccad4 Mon Sep 17 00:00:00 2001
From: unknown <jimw@mysql.com>
Date: Fri, 1 Apr 2005 16:09:20 -0800
Subject: [PATCH] Fix handling of max_allowed_packet and net_buffer_length in
 embedded server when a size suffix (K, M, G) is added. (Bug #9472)

sql/mysqld.cc:
  Instead of (re)parsing max_allowed_packet and net_buffer_length
  for the embedded server, just set the global variables to what
  is set in global_system_variables within get_options().
---
 sql/mysqld.cc | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index d75efbd0b00..0590333a20f 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5916,16 +5916,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     sf_malloc_mem_limit = atoi(argument);
 #endif
     break;
-#ifdef EMBEDDED_LIBRARY
-  case OPT_MAX_ALLOWED_PACKET:
-    max_allowed_packet= atoi(argument);
-    global_system_variables.max_allowed_packet= max_allowed_packet;
-    break;
-  case OPT_NET_BUFFER_LENGTH:
-    net_buffer_length=  atoi(argument);
-    global_system_variables.net_buffer_length= net_buffer_length;
-    break;
-#endif
 #include <sslopt-case.h>
   case 'V':
     print_version();
@@ -6477,6 +6467,9 @@ static void get_options(int argc,char **argv)
 #ifndef EMBEDDED_LIBRARY
   if (mysqld_chroot)
     set_root(mysqld_chroot);
+#else
+  max_allowed_packet= global_system_variables.max_allowed_packet;
+  net_buffer_length= global_system_variables.net_buffer_length;
 #endif
   fix_paths();