diff options
| author | unknown <monty@mysql.com> | 2005-10-14 11:44:46 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-10-14 11:44:46 +0300 |
| commit | 91afe31fe06e027fb4dd981b1953fc5b06a6b5e5 (patch) | |
| tree | 12cfdee079a5db56e368e2c2e53eb2458924c4f4 /sql/log_event.cc | |
| parent | 7ec9653938aab3e4cf480d69694bbb7f78557e08 (diff) | |
| download | mariadb-git-91afe31fe06e027fb4dd981b1953fc5b06a6b5e5.tar.gz | |
Fixed compile errors on windows
VC++Files/test1/mysql_thr.c:
Fixed typo
VC++Files/thr_test/thr_test.c:
Fixed typo
sql/log_event.cc:
Removed compiler warning
Fixed compile error on windows
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 9bc62b30899..2ec63febca4 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1160,7 +1160,7 @@ Query_log_event::Query_log_event(THD* thd_arg, const char* query_arg, But it's likely that we don't want to use 32 bits for 3 bits; in the future we will probably want to reclaim the 29 bits. So we need the &. */ - flags2= thd_arg->options & OPTIONS_WRITTEN_TO_BIN_LOG; + flags2= (uint32) (thd_arg->options & OPTIONS_WRITTEN_TO_BIN_LOG); DBUG_ASSERT(thd->variables.character_set_client->number < 256*256); DBUG_ASSERT(thd->variables.collation_connection->number < 256*256); DBUG_ASSERT(thd->variables.collation_server->number < 256*256); @@ -2984,9 +2984,8 @@ Rotate_log_event::Rotate_log_event(THD* thd_arg, llstr(pos_arg, buff), flags)); #endif if (flags & DUP_NAME) - new_log_ident= my_strdup_with_length(new_log_ident_arg, - ident_len, - MYF(MY_WME)); + new_log_ident= my_strdup_with_length((const byte*) new_log_ident_arg, + ident_len, MYF(MY_WME)); DBUG_VOID_RETURN; } #endif |