mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merging
BitKeeper/etc/logging_ok: auto-union sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_func.cc: Auto merged sql/mysql_priv.h: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.cc: Auto merged
This commit is contained in:
@@ -16,6 +16,8 @@
|
||||
|
||||
// Sasha Pachev <sasha@mysql.com> is currently in charge of this file
|
||||
|
||||
#ifndef EMBEDDED_LIBRARY
|
||||
|
||||
#include "mysql_priv.h"
|
||||
#include "sql_repl.h"
|
||||
#include "sql_acl.h"
|
||||
@@ -1153,3 +1155,7 @@ int log_loaded_block(IO_CACHE* file)
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user