mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
After merge fixes
This commit is contained in:
9
Docs/manual_toc.html
Normal file
9
Docs/manual_toc.html
Normal file
@ -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>
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Reference in New Issue
Block a user