database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

buildbot detected problems

Browse Source 
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
This commit is contained in:
Sergei Golubchik
2010-07-24 08:10:03 +02:00
parent 1cad7ebf8d
commit 9d8ecf782b
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysys/mf_keycache.c
View File

@@ -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];
}

5
storage/example/ha_example.cc
View File

@@ -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);
}

2
storage/xtradb/Makefile.am
View File

@@ -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)