List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:May 28 2012 1:03pm
Subject:bzr push into mysql-trunk branch (Georgi.Kodinov:3911 to 3912) WL#5924
View as plain text  
 3912 Georgi Kodinov	2012-05-28
      WL#5924 addendum #1 : fix a pb2 compile problem on bsd

    modified:
      sql/sql_acl.cc
 3911 Jimmy Yang	2012-05-28
      Check in WL #6218 Support multiple table access through InnoDB Memcached
      
      rb://1048 approved by Sunny Bains

    removed:
      plugin/innodb_memcached/innodb_memcache/include/innodb_list.h
    modified:
      plugin/innodb_memcached/daemon_memcached/daemon/memcached.c
      plugin/innodb_memcached/daemon_memcached/include/memcached/engine.h
      plugin/innodb_memcached/innodb_memcache/CMakeLists.txt
      plugin/innodb_memcached/innodb_memcache/include/innodb_api.h
      plugin/innodb_memcached/innodb_memcache/include/innodb_cb_api.h
      plugin/innodb_memcached/innodb_memcache/include/innodb_config.h
      plugin/innodb_memcached/innodb_memcache/include/innodb_engine.h
      plugin/innodb_memcached/innodb_memcache/scripts/innodb_memcached_config.sql
      plugin/innodb_memcached/innodb_memcache/src/handler_api.cc
      plugin/innodb_memcached/innodb_memcache/src/innodb_api.c
      plugin/innodb_memcached/innodb_memcache/src/innodb_config.c
      plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c
      plugin/innodb_memcached/innodb_memcache/src/innodb_engine_private.h
      sql/debug_sync.cc
      storage/innobase/api/api0api.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/api0api.h
=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2012-05-28 10:46:55 +0000
+++ b/sql/sql_acl.cc	2012-05-28 13:02:03 +0000
@@ -8601,7 +8601,7 @@ read_client_connect_attrs(char **ptr, si
 #ifdef HAVE_PSI_THREAD_INTERFACE
   if (PSI_THREAD_CALL(set_thread_connect_attrs)(*ptr, length, from_cs) && log_warnings)
     sql_print_warning("Connection attributes of length %lu were truncated",
-                      length);
+                      (unsigned long) length);
 #endif
   return false;
 }

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (Georgi.Kodinov:3911 to 3912) WL#5924Georgi Kodinov28 May