diff options
| author | sasha@mysql.sashanet.com <> | 2001-01-22 08:51:26 -0700 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2001-01-22 08:51:26 -0700 |
| commit | 1385ffee8bce63759ce63c0cd2ddf14562216a1a (patch) | |
| tree | f039c5f47f00c82385fdb6b6963e035ace6b56e6 /sql/log_event.h | |
| parent | b3392db2900435caebf9d1b56d17a44db7c203cc (diff) | |
| parent | b64d6c9a1d96c88c7eba58986e90461e8bc8b04a (diff) | |
| download | mariadb-git-1385ffee8bce63759ce63c0cd2ddf14562216a1a.tar.gz | |
Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 4dd5e9140f7..3ee1776fde3 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -84,7 +84,7 @@ public: when(when_arg), exec_time(exec_time_arg), valid_exec_time(valid_exec_time_arg) { - server_id = server_id_arg ? server_id_arg : server_id = ::server_id; + server_id = server_id_arg ? server_id_arg : (::server_id); } Log_event(const char* buf): valid_exec_time(0) |