mirror of
https://github.com/MariaDB/server.git
synced 2025-02-11 16:05:34 +01:00
960f6600c8
Fixed some mtr test problems dbug/tests.c: Fixed compiler warnings mysql-test/r/handlersocket.result: Fixed that plugin_license is written mysql-test/suite/innodb/t/innodb_bug60196.test: Force sorted results as it was sometimes different on windows mysql-test/suite/rpl/t/rpl_heartbeat_basic.test: Prolong test as this failed on windows mysql-test/t/handlersocket.test: Fixed that plugin_license is written plugin/handler_socket/handlersocket/handlersocket.cpp: Use maria_declare_plugin plugin/handler_socket/handlersocket/mysql_incl.hpp: Fixed compiler warning plugin/handler_socket/libhsclient/auto_addrinfo.hpp: Fixed compiler warning sql/handler.h: Fixed typo sql/sql_plugin.cc: Fixed bug that caused plugin library name twice in error message storage/maria/ma_checkpoint.c: Fixed compiler warning storage/maria/ma_loghandler.c: Fixed compiler warning unittest/mysys/base64-t.c: Fixed compiler warning unittest/mysys/bitmap-t.c: Fixed compiler warning unittest/mysys/my_malloc-t.c: Fixed compiler warning
56 lines
1.1 KiB
C++
56 lines
1.1 KiB
C++
|
|
// vim:sw=2:ai
|
|
|
|
/*
|
|
* Copyright (C) 2010 DeNA Co.,Ltd.. All rights reserved.
|
|
* See COPYRIGHT.txt for details.
|
|
*/
|
|
|
|
#ifndef DENA_MYSQL_INCL_HPP
|
|
#define DENA_MYSQL_INCL_HPP
|
|
|
|
#ifndef HAVE_CONFIG_H
|
|
#define HAVE_CONFIG_H
|
|
#endif
|
|
|
|
#ifndef MYSQL_DYNAMIC_PLUGIN
|
|
#define MYSQL_DYNAMIC_PLUGIN
|
|
#endif
|
|
|
|
#define MYSQL_SERVER 1
|
|
|
|
#include <my_config.h>
|
|
|
|
#include <mysql_version.h>
|
|
|
|
#if MYSQL_VERSION_ID >= 50505
|
|
#include <my_pthread.h>
|
|
#include <sql_priv.h>
|
|
#include "sql_class.h"
|
|
#include "unireg.h"
|
|
#include "lock.h"
|
|
#include "key.h" // key_copy()
|
|
#include <my_global.h>
|
|
#include <mysql/plugin.h>
|
|
#include <transaction.h>
|
|
#include <sql_base.h>
|
|
// FIXME FIXME FIXME
|
|
#define safeFree(X) my_free(X)
|
|
#undef pthread_cond_timedwait
|
|
#undef pthread_mutex_lock
|
|
#undef pthread_mutex_unlock
|
|
#define pthread_cond_timedwait mysql_cond_timedwait
|
|
#define pthread_mutex_lock mysql_mutex_lock
|
|
#define pthread_mutex_unlock mysql_mutex_unlock
|
|
#define current_stmt_binlog_row_based is_current_stmt_binlog_format_row
|
|
#define clear_current_stmt_binlog_row_based clear_current_stmt_binlog_format_row
|
|
|
|
#else
|
|
#include "mysql_priv.h"
|
|
#endif
|
|
|
|
#undef min
|
|
#undef max
|
|
|
|
#endif
|
|
|