diff options
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/blackhole/ha_blackhole.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/pars/lexyy.c | 2 | ||||
| -rw-r--r-- | storage/myisammrg/ha_myisammrg.cc | 3 | ||||
| -rw-r--r-- | storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/storage/blackhole/ha_blackhole.cc b/storage/blackhole/ha_blackhole.cc index b128ab16cc7..d7e56f91af4 100644 --- a/storage/blackhole/ha_blackhole.cc +++ b/storage/blackhole/ha_blackhole.cc @@ -156,7 +156,7 @@ int ha_blackhole::index_read(byte * buf, const byte * key, enum ha_rkey_function find_flag) { DBUG_ENTER("ha_blackhole::index_read"); - DBUG_RETURN(0); + DBUG_RETURN(HA_ERR_END_OF_FILE); } diff --git a/storage/innobase/pars/lexyy.c b/storage/innobase/pars/lexyy.c index 70daf261186..b65de138573 100644 --- a/storage/innobase/pars/lexyy.c +++ b/storage/innobase/pars/lexyy.c @@ -1017,7 +1017,7 @@ YY_RULE_SETUP yylval = sym_tab_add_bound_lit(pars_sym_tab_global, yytext + 1, &type); - return(type); + return((int) type); } YY_BREAK case 4: diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc index 5394f8ba9e3..df77931ddb5 100644 --- a/storage/myisammrg/ha_myisammrg.cc +++ b/storage/myisammrg/ha_myisammrg.cc @@ -463,6 +463,7 @@ void ha_myisammrg::update_create_info(HA_CREATE_INFO *create_info) { TABLE_LIST *ptr; LEX_STRING db, name; + LINT_INIT(db.str); if (!(ptr = (TABLE_LIST *) thd->calloc(sizeof(TABLE_LIST)))) goto err; @@ -573,6 +574,8 @@ void ha_myisammrg::append_create_info(String *packet) open_table++) { LEX_STRING db, name; + LINT_INIT(db.str); + split_file_name(open_table->table->filename, &db, &name); if (open_table != first) packet->append(','); diff --git a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp index cdba96e7503..52760dbbd36 100644 --- a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp +++ b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp @@ -1338,6 +1338,7 @@ operator<<(NdbOut& out, const Gci_container& gci) return out; } +#ifdef VM_TRACE static NdbOut& operator<<(NdbOut& out, const Gci_container_pod& gci) @@ -1346,7 +1347,7 @@ operator<<(NdbOut& out, const Gci_container_pod& gci) out << *ptr; return out; } - +#endif static Gci_container* |