diff options
| author | Michael Widenius <monty@mariadb.org> | 2014-09-30 20:12:59 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2014-09-30 20:12:59 +0300 |
| commit | caca6b99077718f7ed94ce04ed975dbda427ec7d (patch) | |
| tree | c419c504a4c0edd5c5004b9ed8efe70a588e34c0 | |
| parent | 4630732f258e7ea4db47b0be58c8904d50a21e67 (diff) | |
| download | mariadb-git-caca6b99077718f7ed94ce04ed975dbda427ec7d.tar.gz | |
Fixed warnings
storage/oqgraph/ha_oqgraph.cc:
Fixed compiler warning
storage/xtradb/handler/ha_innodb.cc:
Ifdef:ed note used function
| -rw-r--r-- | sql/sql_yacc.yy | 9 | ||||
| -rw-r--r-- | storage/oqgraph/ha_oqgraph.cc | 2 | ||||
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 7777853e7c5..637464ff450 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -33,6 +33,7 @@ #define Lex (thd->lex) #define Select Lex->current_select +#include <my_global.h> #include "sql_priv.h" #include "unireg.h" // REQUIRED: for other includes #include "sql_parse.h" /* comp_*_creator */ @@ -1834,7 +1835,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); opt_column_list grant_privileges grant_ident grant_list grant_option object_privilege object_privilege_list user_list user_and_role_list rename_list - clear_privileges flush_options flush_option + clear_privileges flush_options flush_option table_or_tables opt_flush_lock flush_lock flush_options_list equal optional_braces opt_mi_check_type opt_to mi_check_types @@ -12816,7 +12817,7 @@ flush_lock: MYSQL_YYABORT; } Lex->type|= REFRESH_FOR_EXPORT; - } EXPORT_SYM + } EXPORT_SYM {} ; flush_options_list: @@ -14829,8 +14830,8 @@ lock: ; table_or_tables: - TABLE_SYM - | TABLES + TABLE_SYM {} + | TABLES {} ; table_lock_list: diff --git a/storage/oqgraph/ha_oqgraph.cc b/storage/oqgraph/ha_oqgraph.cc index 085fd3d73a0..b6096b30b11 100644 --- a/storage/oqgraph/ha_oqgraph.cc +++ b/storage/oqgraph/ha_oqgraph.cc @@ -859,7 +859,7 @@ static int parse_latch_string_to_legacy_int(const String& value, int &latch) unsigned long int v = strtoul( latchValue.c_ptr_safe(), &eptr, 10); if (!*eptr) { // we had an unsigned number; remember 0 is valid too ('vertices' aka 'no_search')) - if (v >= 0 && v < oqgraph::NUM_SEARCH_OP) { + if (v < oqgraph::NUM_SEARCH_OP) { latch = v; return true; } diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index 020d94f0f60..d91cc962b43 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -1179,6 +1179,7 @@ innobase_start_trx_and_assign_read_view( THD* thd); /* in: MySQL thread handle of the user for whom the transaction should be committed */ +#ifdef NOT_USED /*****************************************************************//** Creates an InnoDB transaction struct for the thd if it does not yet have one. Starts a new InnoDB transaction if a transaction is not yet started. And @@ -1195,6 +1196,7 @@ innobase_start_trx_and_clone_read_view( THD* from_thd); /* in: MySQL thread handle of the user session from which the consistent read should be cloned */ +#endif /****************************************************************//** Flushes InnoDB logs to disk and makes a checkpoint. Really, a commit flushes the logs, and the name of this function should be innobase_checkpoint. @@ -4127,6 +4129,7 @@ innobase_commit_ordered( DBUG_VOID_RETURN; } +#ifdef NOT_USED /*****************************************************************//** Creates an InnoDB transaction struct for the thd if it does not yet have one. Starts a new InnoDB transaction if a transaction is not yet started. And @@ -4222,6 +4225,7 @@ innobase_start_trx_and_clone_read_view( DBUG_RETURN(0); } +#endif /*****************************************************************//** Commits a transaction in an InnoDB database or marks an SQL statement |