diff options
| -rw-r--r-- | mysys/mf_keycache.c | 2 | ||||
| -rw-r--r-- | storage/example/ha_example.cc | 5 | ||||
| -rw-r--r-- | storage/xtradb/Makefile.am | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 4e22b3f65a2..08c160910c7 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -5106,7 +5106,7 @@ static SIMPLE_KEY_CACHE_CB ulonglong* dirty_part_map) { uint i= KEYCACHE_BASE_EXPR( file, filepos) % keycache->partitions; - *dirty_part_map|= 1<<i; + *dirty_part_map|= 1ULL << i; return keycache->partition_array[i]; } 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); } diff --git a/storage/xtradb/Makefile.am b/storage/xtradb/Makefile.am index 36d250890f5..97d3eda7938 100644 --- a/storage/xtradb/Makefile.am +++ b/storage/xtradb/Makefile.am @@ -330,7 +330,7 @@ libxtradb_a_CFLAGS= $(AM_CFLAGS) EXTRA_LTLIBRARIES= ha_xtradb.la pkgplugin_LTLIBRARIES= @plugin_xtradb_shared_target@ -ha_xtradb_la_LDFLAGS= -module -rpath $(pkgplugindir) +ha_xtradb_la_LDFLAGS= -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices ha_xtradb_la_CXXFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) ha_xtradb_la_CFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) ha_xtradb_la_SOURCES= $(libxtradb_a_SOURCES) |