database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

merge, fix Windows warnings

Browse Source
This commit is contained in:
Vladislav Vaintroub
2011-11-29 02:00:24 +01:00
parent e79847d16a
commit 82adfe7b2a
6 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/mysql/client_plugin.h
View File

@@ -28,6 +28,9 @@
#include <stdlib.h>
#endif
#ifdef MYSQL_PLUGIN_EXPORT
#undef MYSQL_PLUGIN_EXPORT
#endif
#if defined(_MSC_VER)
#ifdef __cplusplus
#define MYSQL_PLUGIN_EXPORT extern "C" __declspec(dllexport)

3
plugin/feedback/feedback.h
View File

@@ -12,8 +12,9 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifndef MYSQL_SERVER
#define MYSQL_SERVER
#endif
#include <mysql_priv.h>
namespace feedback {

2
storage/maria/ma_bitmap.c
View File

@@ -293,7 +293,7 @@ my_bool _ma_bitmap_init(MARIA_SHARE *share, File file,
bytes/= 6;
bytes*= 6;
bitmap->last_bitmap_page= last_bitmap_page;
bitmap->last_total_size= bytes;
bitmap->last_total_size= (uint)bytes;
*last_page= ((last_bitmap_page + bytes*8/3));
}

2
storage/xtradb/handler/ha_innodb.cc
View File

@@ -11619,7 +11619,7 @@ static MYSQL_SYSVAR_ULONG(concurrency_tickets, srv_n_free_tickets_to_enter,
#else
#define kill_idle_help_text "No effect for this build."
#endif
static MYSQL_SYSVAR_LONG(kill_idle_transaction, srv_kill_idle_transaction,
static MYSQL_SYSVAR_LONGLONG(kill_idle_transaction, srv_kill_idle_transaction,
PLUGIN_VAR_RQCMDARG, kill_idle_help_text, NULL, NULL, 0, 0, LONG_MAX, 0);
static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads,

2
storage/xtradb/include/srv0srv.h
View File

@@ -285,7 +285,7 @@ extern ibool srv_print_latch_waits;
extern ulint srv_activity_count;
extern ulint srv_fatal_semaphore_wait_threshold;
extern ulint srv_dml_needed_delay;
extern lint srv_kill_idle_transaction;
extern long long srv_kill_idle_transaction;
extern mutex_t* kernel_mutex_temp;/* mutex protecting the server, trx structs,
query threads, and lock table: we allocate

2
storage/xtradb/srv/srv0srv.c
View File

@@ -106,7 +106,7 @@ UNIV_INTERN ulint srv_activity_count = 0;
UNIV_INTERN ulint srv_fatal_semaphore_wait_threshold = 600;
/**/
UNIV_INTERN lint srv_kill_idle_transaction = 0;
UNIV_INTERN long long srv_kill_idle_transaction = 0;
/* How much data manipulation language (DML) statements need to be delayed,
in microseconds, in order to reduce the lagging of the purge thread. */