diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-08-16 16:47:31 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-08-16 16:47:31 +0300 |
| commit | 10ef77fc3bad3ccbcff22ce1e622f2ae96f72f82 (patch) | |
| tree | f9598e9e8fe756a0c983e7674d577a97dc2f85f9 /sql/log_event.h | |
| parent | c492a2392e283b6448cac2b3813b5a8b3906df93 (diff) | |
| download | mariadb-git-10ef77fc3bad3ccbcff22ce1e622f2ae96f72f82.tar.gz | |
Fixed errors found by pushbuild:
Fixed failing func_misc test for embedded server
Added casts to avoid compiler warnings
Removed Table_locks_immediate as it's depending on log file cacheing
Changed type of get_time() to avoid warnings
Removed testing if purger master logs succeded as this is not deterministic
libmysqld/lib_sql.cc:
Fixed failing func_misc test for embedded server
mysql-test/mysql-test-run.pl:
Shut first down slaves, then masters.
This should avoid some errors in the log file about not being able to connect to master during shutdown
mysql-test/r/func_misc.result:
Move DROP TABLE's first
mysql-test/r/status.result:
Removed Table_locks_immediate as it's depending on log file cacheing
mysql-test/suite/ndb/r/ndb_binlog_basic.result:
Removed testing if purger master logs succeded as this is not deterministic
mysql-test/suite/ndb/t/ndb_binlog_basic.test:
Removed testing if purger master logs succeded as this is not deterministic
mysql-test/t/func_misc.test:
Move DROP TABLE's first
mysql-test/t/status.test:
Removed Table_locks_immediate as it's depending on log file cacheing
sql/log_event.cc:
Added cast to avoid warnings
sql/log_event.h:
Changed type of get_time() to avoid warnings
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 33f94f7ab22..05854c2195c 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -774,11 +774,11 @@ public: { return 0; } virtual bool write_data_body(IO_CACHE* file __attribute__((unused))) { return 0; } - inline ulong get_time() + inline time_t get_time() { THD *tmp_thd; if (when) - return (ulong) when; + return when; if (thd) return thd->start_time; if ((tmp_thd= current_thd)) |