diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-04-13 19:44:22 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-04-13 19:44:22 +0200 |
| commit | 24516289237d5677f0624b1f37306ec505a6db8b (patch) | |
| tree | 100a7d06edd3f5c08cec39256f45661a0a0d27a7 /sql | |
| parent | 85a025f30c5196c22c5b1d7960912fe9b3f0d6c0 (diff) | |
| download | mariadb-git-24516289237d5677f0624b1f37306ec505a6db8b.tar.gz | |
Fixed some simple warnings on Windows.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.h | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 | ||||
| -rw-r--r-- | sql/signal_handler.cc | 2 | ||||
| -rw-r--r-- | sql/slave.cc | 4 | ||||
| -rw-r--r-- | sql/sql_test.cc | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index f5c43360ee8..3b1a38cf447 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -150,7 +150,7 @@ public: void count_only_length(); void count_real_length(); void count_decimal_length(); - inline bool get_arg0_date(MYSQL_TIME *ltime, uint fuzzy_date) + inline bool get_arg0_date(MYSQL_TIME *ltime, ulonglong fuzzy_date) { return (null_value=args[0]->get_date(ltime, fuzzy_date)); } diff --git a/sql/mysqld.cc b/sql/mysqld.cc index d6db9a4e230..5828cfbe873 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2220,8 +2220,8 @@ static void network_init(void) { #ifdef HAVE_SYS_UN_H struct sockaddr_un UNIXaddr; -#endif int arg; +#endif DBUG_ENTER("network_init"); if (MYSQL_CALLBACK_ELSE(thread_scheduler, init, (), 0)) diff --git a/sql/signal_handler.cc b/sql/signal_handler.cc index 3e194805dbc..37f28844a7c 100644 --- a/sql/signal_handler.cc +++ b/sql/signal_handler.cc @@ -167,7 +167,7 @@ extern "C" sig_handler handle_fatal_signal(int sig) "where mysqld died. If you see no messages after this, something went\n" "terribly wrong...\n"); my_print_stacktrace(thd ? (uchar*) thd->thread_stack : NULL, - my_thread_stack_size); + (ulong)my_thread_stack_size); } if (thd) { diff --git a/sql/slave.cc b/sql/slave.cc index 9f593b3075e..941a275cd84 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4155,8 +4155,8 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len) { int error= 0; String error_msg; - ulong inc_pos; - ulong event_pos; + ulonglong inc_pos; + ulonglong event_pos; Relay_log_info *rli= &mi->rli; mysql_mutex_t *log_lock= rli->relay_log.get_log_lock(); ulong s_id; diff --git a/sql/sql_test.cc b/sql/sql_test.cc index 46f27f184fa..25ab84fe4db 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -618,8 +618,8 @@ Open streams: %10lu\n", (ulong) my_file_opened, (ulong) my_stream_opened); - ALARM_INFO alarm_info; #ifndef DONT_USE_THR_ALARM + ALARM_INFO alarm_info; thr_alarm_info(&alarm_info); printf("\nAlarm status:\n\ Active alarms: %u\n\ |