database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fixed compiler failures and warnings

Browse Source
This commit is contained in:
Monty
2016-03-20 21:00:58 +02:00
parent 2f7b6c5751
commit 0c9d39edc3
4 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libmysqld/lib_sql.cc
View File

@ -165,7 +165,8 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
arg_length= header_length; arg_length= header_length;
} }
result= dispatch_command(command, thd, (char *) arg, arg_length, FALSE); result= dispatch_command(command, thd, (char *) arg, arg_length, FALSE,
FALSE);
thd->cur_data= 0; thd->cur_data= 0;
thd->mysys_var= NULL; thd->mysys_var= NULL;

2
sql/bounded_queue.h
View File

@ -16,11 +16,11 @@
#ifndef BOUNDED_QUEUE_INCLUDED #ifndef BOUNDED_QUEUE_INCLUDED
#define BOUNDED_QUEUE_INCLUDED #define BOUNDED_QUEUE_INCLUDED
#include <string.h>
#include "my_global.h" #include "my_global.h"
#include "my_base.h" #include "my_base.h"
#include "my_sys.h" #include "my_sys.h"
#include "queues.h" #include "queues.h"
#include <string.h>
class Sort_param; class Sort_param;

10
storage/innobase/handler/ha_innodb.cc
View File

@ -786,16 +786,6 @@ innobase_map_isolation_level(
/*=========================*/ /*=========================*/
enum_tx_isolation iso); /*!< in: MySQL isolation level code */ enum_tx_isolation iso); /*!< in: MySQL isolation level code */
/******************************************************************//**
Maps a MySQL trx isolation level code to the InnoDB isolation level code
@return InnoDB isolation level */
static inline
ulint
innobase_map_isolation_level(
/*=========================*/
enum_tx_isolation iso); /*!< in: MySQL isolation level code
*/
/*************************************************************//** /*************************************************************//**
Check for a valid value of innobase_compression_algorithm. Check for a valid value of innobase_compression_algorithm.
@return 0 for valid innodb_compression_algorithm. */ @return 0 for valid innodb_compression_algorithm. */

18
storage/xtradb/handler/ha_innodb.cc
View File

@ -8318,7 +8318,7 @@ ha_innobase::write_row(
if (share->ib_table != prebuilt->table) { if (share->ib_table != prebuilt->table) {
fprintf(stderr, fprintf(stderr,
"InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.", "InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.",
share->ib_table, prebuilt->table, prebuilt->table->name, prebuilt->table->is_corrupt); share->ib_table, prebuilt->table, prebuilt->table->name, (int) prebuilt->table->is_corrupt);
} }
if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) { if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) {
@ -8671,7 +8671,7 @@ func_exit:
if (share->ib_table != prebuilt->table) { if (share->ib_table != prebuilt->table) {
fprintf(stderr, fprintf(stderr,
"InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.", "InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.",
share->ib_table, prebuilt->table, prebuilt->table->name, prebuilt->table->is_corrupt); share->ib_table, prebuilt->table, prebuilt->table->name, (int) prebuilt->table->is_corrupt);
} }
if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) { if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) {
@ -9091,7 +9091,7 @@ ha_innobase::update_row(
if (share->ib_table != prebuilt->table) { if (share->ib_table != prebuilt->table) {
fprintf(stderr, fprintf(stderr,
"InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.", "InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.",
share->ib_table, prebuilt->table, prebuilt->table->name, prebuilt->table->is_corrupt); share->ib_table, prebuilt->table, prebuilt->table->name, (int) prebuilt->table->is_corrupt);
} }
if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) { if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) {
@ -9212,7 +9212,7 @@ wsrep_error:
if (share->ib_table != prebuilt->table) { if (share->ib_table != prebuilt->table) {
fprintf(stderr, fprintf(stderr,
"InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.", "InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.",
share->ib_table, prebuilt->table, prebuilt->table->name, prebuilt->table->is_corrupt); share->ib_table, prebuilt->table, prebuilt->table->name, (int) prebuilt->table->is_corrupt);
} }
if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) { if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) {
@ -12740,7 +12740,7 @@ ha_innobase::truncate()
if (share->ib_table != prebuilt->table) { if (share->ib_table != prebuilt->table) {
fprintf(stderr, fprintf(stderr,
"InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.", "InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.",
share->ib_table, prebuilt->table, prebuilt->table->name, prebuilt->table->is_corrupt); share->ib_table, prebuilt->table, prebuilt->table->name, (int) prebuilt->table->is_corrupt);
} }
if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) { if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) {
@ -12761,7 +12761,7 @@ ha_innobase::truncate()
if (share->ib_table != prebuilt->table) { if (share->ib_table != prebuilt->table) {
fprintf(stderr, fprintf(stderr,
"InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.", "InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.",
share->ib_table, prebuilt->table, prebuilt->table->name, prebuilt->table->is_corrupt); share->ib_table, prebuilt->table, prebuilt->table->name, (int) prebuilt->table->is_corrupt);
} }
if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) { if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) {
@ -14157,7 +14157,7 @@ ha_innobase::analyze(
if (share->ib_table != prebuilt->table) { if (share->ib_table != prebuilt->table) {
fprintf(stderr, fprintf(stderr,
"InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.", "InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.",
share->ib_table, prebuilt->table, prebuilt->table->name, prebuilt->table->is_corrupt); share->ib_table, prebuilt->table, prebuilt->table->name, (int) prebuilt->table->is_corrupt);
} }
if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) { if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) {
@ -14173,7 +14173,7 @@ ha_innobase::analyze(
if (share->ib_table != prebuilt->table) { if (share->ib_table != prebuilt->table) {
fprintf(stderr, fprintf(stderr,
"InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.", "InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.",
share->ib_table, prebuilt->table, prebuilt->table->name, prebuilt->table->is_corrupt); share->ib_table, prebuilt->table, prebuilt->table->name, (int) prebuilt->table->is_corrupt);
} }
if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) { if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) {
@ -15388,7 +15388,7 @@ ha_innobase::transactional_table_lock(
if (share->ib_table != prebuilt->table) { if (share->ib_table != prebuilt->table) {
fprintf(stderr, fprintf(stderr,
"InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.", "InnoDB: Warning: share->ib_table %p prebuilt->table %p table %s is_corrupt %d.",
share->ib_table, prebuilt->table, prebuilt->table->name, prebuilt->table->is_corrupt); share->ib_table, prebuilt->table, prebuilt->table->name, (int) prebuilt->table->is_corrupt);
} }
if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) { if (UNIV_UNLIKELY(share->ib_table && share->ib_table->is_corrupt)) {