summaryrefslogtreecommitdiff
path: root/storage/example
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2010-07-24 08:10:03 +0200
committerSergei Golubchik <sergii@pisem.net>2010-07-24 08:10:03 +0200
commit9d8ecf782b7f7b4322359aaca57162a08675d907 (patch)
treeadbdc03c7ad149357b0314325401c8ce06ff1d70 /storage/example
parent1cad7ebf8d40e17d28203a96945a378359bfc562 (diff)
downloadmariadb-git-9d8ecf782b7f7b4322359aaca57162a08675d907.tar.gz
buildbot detected problems
mysys/mf_keycache.c: warning on windows storage/example/ha_example.cc: fighting the warnings don't ifdef too much. a function must return a value! storage/xtradb/Makefile.am: add -lmysqlservices for ha_xtradb.so plugin to load
Diffstat (limited to 'storage/example')
-rw-r--r--storage/example/ha_example.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc
index 5ad6a45a744..e8ef0b72bc8 100644
--- a/storage/example/ha_example.cc
+++ b/storage/example/ha_example.cc
@@ -370,13 +370,13 @@ int ha_example::open(const char *name, int mode, uint test_if_locked)
#ifndef DBUG_OFF
example_table_options_struct *options=
(example_table_options_struct *)table->s->option_struct;
-#endif
DBUG_ASSERT(options);
DBUG_PRINT("info", ("strparam: '%-.64s' ullparam: %llu enumparam: %u "\
"boolparam: %u",
(options->strparam ? options->strparam : "<NULL>"),
options->ullparam, options->enumparam, options->boolparam));
+#endif
DBUG_RETURN(0);
}
@@ -922,9 +922,8 @@ int ha_example::create(const char *name, TABLE *table_arg,
field_options->compex_param_to_parse_it_in_engine :
"<NULL>")));
}
-
- DBUG_RETURN(0);
#endif
+ DBUG_RETURN(0);
}