bk commit into 4.1 tree (jimw:1.2157) BUG#9472

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2157 05/04/01 16:09:20 jimw@stripped +1 -0
  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
    1.566 05/04/01 16:09:18 jimw@stripped +3 -10
    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().

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-9472b

--- 1.565/sql/mysqld.cc	2005-03-29 02:30:29 -08:00
+++ 1.566/sql/mysqld.cc	2005-04-01 16:09:18 -08:00
@@ -5916,16 +5916,6 @@
     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 @@
 #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();