summaryrefslogtreecommitdiff
path: root/sql/sql_audit.h
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2016-03-22 18:44:46 +0100
committerVladislav Vaintroub <wlad@mariadb.com>2016-03-22 18:46:02 +0100
commit6950f83d5e105f289399a58b38e8956a4c39072c (patch)
tree5ef40ae42c1db789d4b546709d22a1d6f6e94565 /sql/sql_audit.h
parent642978cc57285f182740aa2794ffb145bd1d09b1 (diff)
downloadmariadb-git-6950f83d5e105f289399a58b38e8956a4c39072c.tar.gz
fix most annoying warnings on Windows
Diffstat (limited to 'sql/sql_audit.h')
-rw-r--r--sql/sql_audit.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/sql/sql_audit.h b/sql/sql_audit.h
index 894108b9713..d6f670538cd 100644
--- a/sql/sql_audit.h
+++ b/sql/sql_audit.h
@@ -108,7 +108,7 @@ void mysql_audit_general_log(THD *thd, time_t time,
if (thd)
{
- event.general_thread_id= thd->thread_id;
+ event.general_thread_id= (unsigned long)thd->thread_id;
event.general_charset= thd->variables.character_set_client;
event.database= thd->db;
event.database_length= thd->db_length;
@@ -158,7 +158,7 @@ void mysql_audit_general(THD *thd, uint event_subtype,
{
event.general_user= user_buff;
event.general_user_length= make_user_name(thd, user_buff);
- event.general_thread_id= thd->thread_id;
+ event.general_thread_id= (unsigned long)thd->thread_id;
event.general_query= thd->query_string.str();
event.general_query_length= thd->query_string.length();
event.general_charset= thd->query_string.charset();
@@ -194,7 +194,7 @@ void mysql_audit_notify_connection_connect(THD *thd)
event.event_subclass= MYSQL_AUDIT_CONNECTION_CONNECT;
event.status= thd->get_stmt_da()->is_error() ?
thd->get_stmt_da()->sql_errno() : 0;
- event.thread_id= thd->thread_id;
+ event.thread_id= (unsigned long)thd->thread_id;
event.user= sctx->user;
event.user_length= safe_strlen(sctx->user);
event.priv_user= sctx->priv_user;
@@ -224,7 +224,7 @@ void mysql_audit_notify_connection_disconnect(THD *thd, int errcode)
event.event_subclass= MYSQL_AUDIT_CONNECTION_DISCONNECT;
event.status= errcode;
- event.thread_id= thd->thread_id;
+ event.thread_id= (unsigned long)thd->thread_id;
event.user= sctx->user;
event.user_length= safe_strlen(sctx->user);
event.priv_user= sctx->priv_user;
@@ -255,7 +255,7 @@ void mysql_audit_notify_connection_change_user(THD *thd)
event.event_subclass= MYSQL_AUDIT_CONNECTION_CHANGE_USER;
event.status= thd->get_stmt_da()->is_error() ?
thd->get_stmt_da()->sql_errno() : 0;
- event.thread_id= thd->thread_id;
+ event.thread_id= (unsigned long)thd->thread_id;
event.user= sctx->user;
event.user_length= safe_strlen(sctx->user);
event.priv_user= sctx->priv_user;
@@ -285,7 +285,7 @@ void mysql_audit_external_lock(THD *thd, TABLE_SHARE *share, int lock)
event.event_subclass= MYSQL_AUDIT_TABLE_LOCK;
event.read_only= lock == F_RDLCK;
- event.thread_id= thd->thread_id;
+ event.thread_id= (unsigned long)thd->thread_id;
event.user= sctx->user;
event.priv_user= sctx->priv_user;
event.priv_host= sctx->priv_host;
@@ -319,7 +319,7 @@ void mysql_audit_create_table(TABLE *table)
event.event_subclass= MYSQL_AUDIT_TABLE_CREATE;
event.read_only= 0;
- event.thread_id= thd->thread_id;
+ event.thread_id= (unsigned long)thd->thread_id;
event.user= sctx->user;
event.priv_user= sctx->priv_user;
event.priv_host= sctx->priv_host;
@@ -351,7 +351,7 @@ void mysql_audit_drop_table(THD *thd, TABLE_LIST *table)
event.event_subclass= MYSQL_AUDIT_TABLE_DROP;
event.read_only= 0;
- event.thread_id= thd->thread_id;
+ event.thread_id= (unsigned long)thd->thread_id;
event.user= sctx->user;
event.priv_user= sctx->priv_user;
event.priv_host= sctx->priv_host;
@@ -384,7 +384,7 @@ void mysql_audit_rename_table(THD *thd, const char *old_db, const char *old_tb,
event.event_subclass= MYSQL_AUDIT_TABLE_RENAME;
event.read_only= 0;
- event.thread_id= thd->thread_id;
+ event.thread_id= (unsigned long)thd->thread_id;
event.user= sctx->user;
event.priv_user= sctx->priv_user;
event.priv_host= sctx->priv_host;
@@ -416,7 +416,7 @@ void mysql_audit_alter_table(THD *thd, TABLE_LIST *table)
event.event_subclass= MYSQL_AUDIT_TABLE_ALTER;
event.read_only= 0;
- event.thread_id= thd->thread_id;
+ event.thread_id= (unsigned long)thd->thread_id;
event.user= sctx->user;
event.priv_user= sctx->priv_user;
event.priv_host= sctx->priv_host;