diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-05-18 16:40:16 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-05-18 16:40:16 +0300 |
| commit | 960f6600c86d8b94e29825a3a6bf72f92353e17f (patch) | |
| tree | 6f268179143188043af75c49a44d700b4d71ef24 /storage/maria | |
| parent | d4d3ca204f9d36b01be2c4dad15d0cc5b078c6e6 (diff) | |
| download | mariadb-git-960f6600c86d8b94e29825a3a6bf72f92353e17f.tar.gz | |
Fixed compile warnings
Fixed some mtr test problems
dbug/tests.c:
Fixed compiler warnings
mysql-test/r/handlersocket.result:
Fixed that plugin_license is written
mysql-test/suite/innodb/t/innodb_bug60196.test:
Force sorted results as it was sometimes different on windows
mysql-test/suite/rpl/t/rpl_heartbeat_basic.test:
Prolong test as this failed on windows
mysql-test/t/handlersocket.test:
Fixed that plugin_license is written
plugin/handler_socket/handlersocket/handlersocket.cpp:
Use maria_declare_plugin
plugin/handler_socket/handlersocket/mysql_incl.hpp:
Fixed compiler warning
plugin/handler_socket/libhsclient/auto_addrinfo.hpp:
Fixed compiler warning
sql/handler.h:
Fixed typo
sql/sql_plugin.cc:
Fixed bug that caused plugin library name twice in error message
storage/maria/ma_checkpoint.c:
Fixed compiler warning
storage/maria/ma_loghandler.c:
Fixed compiler warning
unittest/mysys/base64-t.c:
Fixed compiler warning
unittest/mysys/bitmap-t.c:
Fixed compiler warning
unittest/mysys/my_malloc-t.c:
Fixed compiler warning
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/ma_checkpoint.c | 2 | ||||
| -rw-r--r-- | storage/maria/ma_loghandler.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/storage/maria/ma_checkpoint.c b/storage/maria/ma_checkpoint.c index 2f5ba72a40e..30124b2205d 100644 --- a/storage/maria/ma_checkpoint.c +++ b/storage/maria/ma_checkpoint.c @@ -763,6 +763,8 @@ static int collect_tables(LEX_STRING *str, LSN checkpoint_start_log_horizon) PAGECACHE_FLUSH_FILTER filter; DBUG_ENTER("collect_tables"); + LINT_INIT(state_copies_horizon); + /* let's make a list of distinct shares */ mysql_mutex_lock(&THR_LOCK_maria); for (nb= 0, pos= maria_open_list; pos; pos= pos->next) diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c index 801efd3f07c..341bbc6088f 100644 --- a/storage/maria/ma_loghandler.c +++ b/storage/maria/ma_loghandler.c @@ -7474,6 +7474,8 @@ static void translog_force_current_buffer_to_finish() uint16 left= TRANSLOG_PAGE_SIZE - log_descriptor.bc.current_page_fill; uint16 current_page_fill, write_counter, previous_offset; DBUG_ENTER("translog_force_current_buffer_to_finish"); + LINT_INIT(current_page_fill); + DBUG_PRINT("enter", ("Buffer #%u 0x%lx " "Buffer addr: (%lu,0x%lx) " "Page addr: (%lu,0x%lx) " |