diff options
| author | monty@mysql.com <> | 2004-05-27 02:50:42 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-05-27 02:50:42 +0300 |
| commit | 272c3a2669727e673c5ad6aa02035a5981ea29df (patch) | |
| tree | e8f0280e6d5400b10d0c17c98f09e48a7f824dd1 | |
| parent | c1d7d8e27e639cc2c534ab8ae6c21346c94cc5cb (diff) | |
| download | mariadb-git-272c3a2669727e673c5ad6aa02035a5981ea29df.tar.gz | |
After merge fixes
| -rw-r--r-- | Docs/manual_toc.html | 9 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 | ||||
| -rw-r--r-- | libmysqld/libmysqld.c | 9 |
3 files changed, 10 insertions, 10 deletions
diff --git a/Docs/manual_toc.html b/Docs/manual_toc.html new file mode 100644 index 00000000000..b9014e5efb9 --- /dev/null +++ b/Docs/manual_toc.html @@ -0,0 +1,9 @@ +<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> diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 26609e748a7..2ceeb43a91e 100644 --- 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; diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index b4804c62f2d..3b9c2bab448 100644 --- 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; |