diff options
| author | Monty <monty@mariadb.org> | 2018-01-05 16:52:40 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-05 16:52:40 +0200 |
| commit | e9a2082634ee7e5f2c61f7cbae467ad16925b63c (patch) | |
| tree | 6a3a6cfb0e64a21b7d60348ab5e69099fb532223 /sql/log_event.cc | |
| parent | 1a1bda2222e0c2ab41baed1510f6fbca80c20d31 (diff) | |
| parent | 287d105398db726cc15c02dff26ce039cf03ded3 (diff) | |
| download | mariadb-git-e9a2082634ee7e5f2c61f7cbae467ad16925b63c.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
mysql-test/r/cte_nonrecursive.result
mysql-test/suite/galera/r/galera_bf_abort.result
mysql-test/suite/galera/r/galera_bf_abort_get_lock.result
mysql-test/suite/galera/r/galera_bf_abort_sleep.result
mysql-test/suite/galera/r/galera_enum.result
mysql-test/suite/galera/r/galera_fk_conflict.result
mysql-test/suite/galera/r/galera_insert_multi.result
mysql-test/suite/galera/r/galera_many_indexes.result
mysql-test/suite/galera/r/galera_mdl_race.result
mysql-test/suite/galera/r/galera_nopk_bit.result
mysql-test/suite/galera/r/galera_nopk_blob.result
mysql-test/suite/galera/r/galera_nopk_large_varchar.result
mysql-test/suite/galera/r/galera_nopk_unicode.result
mysql-test/suite/galera/r/galera_pk_bigint_signed.result
mysql-test/suite/galera/r/galera_pk_bigint_unsigned.result
mysql-test/suite/galera/r/galera_serializable.result
mysql-test/suite/galera/r/galera_toi_drop_database.result
mysql-test/suite/galera/r/galera_toi_lock_exclusive.result
mysql-test/suite/galera/r/galera_toi_truncate.result
mysql-test/suite/galera/r/galera_unicode_pk.result
mysql-test/suite/galera/r/galera_var_auto_inc_control_off.result
mysql-test/suite/galera/r/galera_wsrep_log_conficts.result
sql/field.cc
sql/rpl_gtid.cc
sql/share/errmsg-utf8.txt
sql/sql_acl.cc
sql/sql_parse.cc
sql/sql_partition_admin.cc
sql/sql_prepare.cc
sql/sql_repl.cc
sql/sql_table.cc
sql/sql_yacc.yy
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index d884947390a..7efd0b03260 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -18,7 +18,6 @@ #include <my_global.h> #include "sql_priv.h" -#include "mysqld_error.h" #ifndef MYSQL_CLIENT #include "unireg.h" @@ -44,6 +43,8 @@ #include <strfunc.h> #include "compat56.h" #include "wsrep_mysqld.h" +#else +#include "mysqld_error.h" #endif /* MYSQL_CLIENT */ #include <my_bitmap.h> @@ -1935,9 +1936,9 @@ err: #endif if (event.length() >= OLD_HEADER_LEN) sql_print_error("Error in Log_event::read_log_event(): '%s'," - " data_len: %lu, event_type: %d", error, - uint4korr(&event[EVENT_LEN_OFFSET]), - (uchar)event[EVENT_TYPE_OFFSET]); + " data_len: %lu, event_type: %u", error, + (ulong) uint4korr(&event[EVENT_LEN_OFFSET]), + (uint) (uchar)event[EVENT_TYPE_OFFSET]); else sql_print_error("Error in Log_event::read_log_event(): '%s'", error); /* |