After merge fixes

272c3a26 · monty@mysql.com · c1d7d8e2 · 272c3a26 · 272c3a26 · 272c3a26
Commit 272c3a26 authored May 27, 2004 by monty@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 10 deletions

Docs/manual_toc.html Docs/manual_toc.html +9 -0

libmysqld/lib_sql.cc libmysqld/lib_sql.cc +1 -1

libmysqld/libmysqld.c libmysqld/libmysqld.c +0 -9

No files found.
--- a/Docs/manual_toc.html
+++ b/Docs/manual_toc.html
+<html>
+<head>
+<title>Place holder for manual_toc.html</title>
+</head>
+<body>
+This is just a place holder for the autogenerated manual_toc.html
+to make "make dist" happy.
+</body>
+</html>
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -25,7 +25,7 @@

 extern "C"
 {
-  unsigned long max_allowed_packet, net_buffer_length;
+  extern unsigned long max_allowed_packet, net_buffer_length;
 }

 static int fake_argc= 1;

--- a/libmysqld/libmysqld.c
+++ b/libmysqld/libmysqld.c
@@ -85,15 +85,6 @@ static void end_server(MYSQL *mysql)
 }


-static MYSQL_PARAMETERS mysql_internal_parameters=
-{&max_allowed_packet, &net_buffer_length};
-
-MYSQL_PARAMETERS *STDCALL mysql_get_parameters()
-{
-  return &mysql_internal_parameters;
-}
-
-
 static int mysql_init_charset(MYSQL *mysql)
 {
  char charset_name_buff[16], *charset_name;