mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
merge with 4.0 to get windows fixes
VC++Files/client/mysqlclient.dsp: Auto merged VC++Files/innobase/innobase.dsp: Auto merged include/mysql.h: Auto merged include/mysql_com.h: Auto merged innobase/include/log0log.h: Auto merged innobase/include/log0log.ic: Auto merged innobase/include/mtr0mtr.h: Auto merged innobase/log/log0log.c: Auto merged innobase/log/log0recv.c: Auto merged innobase/que/que0que.c: Auto merged libmysql/libmysql.c: Auto merged libmysql_r/Makefile.am: Auto merged sql/log_event.cc: Auto merged sql/mysqld.cc: Auto merged tools/mysqlmanager.c: Auto merged
This commit is contained in:
@ -16,7 +16,6 @@ EXPORTS
|
||||
list_add
|
||||
list_delete
|
||||
load_defaults
|
||||
max_allowed_packet
|
||||
my_end
|
||||
my_getopt_print_errors
|
||||
my_init
|
||||
@ -24,6 +23,7 @@ EXPORTS
|
||||
my_memdup
|
||||
my_no_flags_free
|
||||
my_path
|
||||
mysql_get_parameters
|
||||
my_print_help
|
||||
my_print_variables
|
||||
my_realloc
|
||||
@ -116,7 +116,6 @@ EXPORTS
|
||||
mysql_stmt_sqlstate
|
||||
mysql_sqlstate
|
||||
mysql_get_server_version
|
||||
net_buffer_length
|
||||
set_dynamic
|
||||
strcend
|
||||
strcont
|
||||
|
Reference in New Issue
Block a user