[Commits] Rev 2832: buildbot detected problems in http://bazaar.launchpad.net/~maria-captains/maria/5.2/

serg at askmonty.org serg at askmonty.org
Sat Jul 24 09:10:08 EEST 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.2/

------------------------------------------------------------
revno: 2832
revision-id: sergii at pisem.net-20100724061003-dt7akyw7w7afxk92
parent: sergii at pisem.net-20100723200238-e7f75320zfr06vbk
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.2
timestamp: Sat 2010-07-24 08:10:03 +0200
message:
  buildbot detected problems
-------------- next part --------------
=== modified file 'mysys/mf_keycache.c'
--- a/mysys/mf_keycache.c	2010-05-27 21:30:37 +0000
+++ b/mysys/mf_keycache.c	2010-07-24 06:10:03 +0000
@@ -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];
 }
 

=== modified file 'storage/example/ha_example.cc'
--- a/storage/example/ha_example.cc	2010-07-19 18:53:28 +0000
+++ b/storage/example/ha_example.cc	2010-07-24 06:10:03 +0000
@@ -370,13 +370,13 @@ int ha_example::open(const char *name, i
 #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,
                           field_options->compex_param_to_parse_it_in_engine :
                           "<NULL>")));
   }
-
-  DBUG_RETURN(0);
 #endif
+  DBUG_RETURN(0);
 }
 
 

=== modified file 'storage/xtradb/Makefile.am'
--- a/storage/xtradb/Makefile.am	2010-06-09 21:29:18 +0000
+++ b/storage/xtradb/Makefile.am	2010-07-24 06:10:03 +0000
@@ -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)



More information about the commits mailing list