database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-29 21:42:28 +03:00
Code

Fixed warnings

Browse Source 
storage/oqgraph/ha_oqgraph.cc:
  Fixed compiler warning
storage/xtradb/handler/ha_innodb.cc:
  Ifdef:ed note used function
This commit is contained in:
Michael Widenius 2014-09-30 20:12:59 +03:00
parent 4630732f25
commit caca6b9907
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_yacc.yy
View File

@ -33,6 +33,7 @@
#define Lex (thd->lex) #define Lex (thd->lex)
#define Select Lex->current_select #define Select Lex->current_select
#include <my_global.h>
#include "sql_priv.h" #include "sql_priv.h"
#include "unireg.h" // REQUIRED: for other includes #include "unireg.h" // REQUIRED: for other includes
#include "sql_parse.h" /* comp_*_creator */ #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 opt_column_list grant_privileges grant_ident grant_list grant_option
object_privilege object_privilege_list user_list user_and_role_list object_privilege object_privilege_list user_list user_and_role_list
rename_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 opt_flush_lock flush_lock flush_options_list
equal optional_braces equal optional_braces
opt_mi_check_type opt_to mi_check_types opt_mi_check_type opt_to mi_check_types
@ -12816,7 +12817,7 @@ flush_lock:
MYSQL_YYABORT; MYSQL_YYABORT;
} }
Lex->type|= REFRESH_FOR_EXPORT; Lex->type|= REFRESH_FOR_EXPORT;
} EXPORT_SYM } EXPORT_SYM {}
; ;
flush_options_list: flush_options_list:
@ -14829,8 +14830,8 @@ lock:
; ;
table_or_tables: table_or_tables:
TABLE_SYM TABLE_SYM {}
| TABLES | TABLES {}
; ;
table_lock_list: table_lock_list:

2
storage/oqgraph/ha_oqgraph.cc
View File

@ -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); unsigned long int v = strtoul( latchValue.c_ptr_safe(), &eptr, 10);
if (!*eptr) { if (!*eptr) {
// we had an unsigned number; remember 0 is valid too ('vertices' aka 'no_search')) // 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; latch = v;
return true; return true;
} }

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

@ -1179,6 +1179,7 @@ innobase_start_trx_and_assign_read_view(
THD* thd); /* in: MySQL thread handle of the THD* thd); /* in: MySQL thread handle of the
user for whom the transaction should user for whom the transaction should
be committed */ be committed */
#ifdef NOT_USED
/*****************************************************************//** /*****************************************************************//**
Creates an InnoDB transaction struct for the thd if it does not yet have one. 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 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 THD* from_thd); /* in: MySQL thread handle of the
user session from which the consistent user session from which the consistent
read should be cloned */ read should be cloned */
#endif
/****************************************************************//** /****************************************************************//**
Flushes InnoDB logs to disk and makes a checkpoint. Really, a commit flushes 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. the logs, and the name of this function should be innobase_checkpoint.
@ -4127,6 +4129,7 @@ innobase_commit_ordered(
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
#ifdef NOT_USED
/*****************************************************************//** /*****************************************************************//**
Creates an InnoDB transaction struct for the thd if it does not yet have one. 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 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); DBUG_RETURN(0);
} }
#endif
/*****************************************************************//** /*****************************************************************//**
Commits a transaction in an InnoDB database or marks an SQL statement Commits a transaction in an InnoDB database or marks an SQL statement