mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
After merge fixes
Docs/manual_toc.html: Rename: BitKeeper/deleted/.del-manual_toc.html~f483f2d33d9acb41 -> Docs/manual_toc.html libmysqld/lib_sql.cc: Fixed type of new variables libmysqld/libmysqld.c: Removed duplicate function (allready in libmysql.c)
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"
|
extern "C"
|
||||||
{
|
{
|
||||||
unsigned long max_allowed_packet, net_buffer_length;
|
extern unsigned long max_allowed_packet, net_buffer_length;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int fake_argc= 1;
|
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)
|
static int mysql_init_charset(MYSQL *mysql)
|
||||||
{
|
{
|
||||||
char charset_name_buff[16], *charset_name;
|
char charset_name_buff[16], *charset_name;
|
||||||
|
Reference in New Issue
Block a user