bzr merge -r4346 maria/10.0 (maria-10.0.13)

4 files changed, 17 insertions, 11 deletions

diff --git a/include/keycache.h b/include/keycache.h
index 8fa9bf1cd18..85937ebefb9 100644
--- a/include/keycache.h
+++ b/include/keycache.h
@@ -67,11 +67,13 @@ typedef enum key_cache_type
 typedef
   int    (*INIT_KEY_CACHE)  
            (void *, uint key_cache_block_size,
-            size_t use_mem, uint division_limit, uint age_threshold);
+            size_t use_mem, uint division_limit, uint age_threshold,
+            uint changed_blocks_hash_size);
 typedef
   int    (*RESIZE_KEY_CACHE)
            (void *, uint key_cache_block_size,
-            size_t use_mem, uint division_limit, uint age_threshold);
+            size_t use_mem, uint division_limit, uint age_threshold,
+            uint changed_blocks_hash_size);
 typedef
   void   (*CHANGE_KEY_CACHE_PARAM)
            (void *keycache_cb,
@@ -146,6 +148,7 @@ typedef struct st_key_cache
   ulonglong param_division_limit;/* min. percentage of warm blocks           */
   ulonglong param_age_threshold; /* determines when hot block is downgraded  */
   ulonglong param_partitions;    /* number of the key cache partitions       */
+  ulonglong changed_blocks_hash_size; /* number of hash buckets for changed files */
   my_bool key_cache_inited;      /* <=> key cache has been created           */
   my_bool can_be_used;           /* usage of cache for read/write is allowed */
   my_bool in_init;               /* set to 1 in MySQL during init/resize     */
@@ -160,10 +163,11 @@ extern KEY_CACHE dflt_key_cache_var, *dflt_key_cache;
 
 extern int init_key_cache(KEY_CACHE *keycache, uint key_cache_block_size,
 			  size_t use_mem, uint division_limit,
-			  uint age_threshold, uint partitions);
+			  uint age_threshold, uint changed_blocks_hash_size,
+                          uint partitions);
 extern int resize_key_cache(KEY_CACHE *keycache, uint key_cache_block_size,
 			    size_t use_mem, uint division_limit,
-			    uint age_threshold);
+			    uint age_threshold, uint changed_blocks_hash_size);
 extern void change_key_cache_param(KEY_CACHE *keycache, uint division_limit,
 				   uint age_threshold);
 extern uchar *key_cache_read(KEY_CACHE *keycache,
@@ -202,6 +206,7 @@ extern int repartition_key_cache(KEY_CACHE *keycache,
 			         size_t use_mem, 
                                  uint division_limit,
 			         uint age_threshold,
+                                 uint changed_blocks_hash_size,
                                  uint partitions);
 C_MODE_END
 #endif /* _keycache_h */
diff --git a/include/mysql.h.pp b/include/mysql.h.pp
index ca5b1ac05bf..6b60389acc3 100644
--- a/include/mysql.h.pp
+++ b/include/mysql.h.pp
@@ -49,9 +49,9 @@ enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY,
    MYSQL_TYPE_DATETIME, MYSQL_TYPE_YEAR,
    MYSQL_TYPE_NEWDATE, MYSQL_TYPE_VARCHAR,
    MYSQL_TYPE_BIT,
-   MYSQL_TYPE_TIMESTAMP2,
-   MYSQL_TYPE_DATETIME2,
-   MYSQL_TYPE_TIME2,
+                        MYSQL_TYPE_TIMESTAMP2,
+                        MYSQL_TYPE_DATETIME2,
+                        MYSQL_TYPE_TIME2,
                         MYSQL_TYPE_NEWDECIMAL=246,
    MYSQL_TYPE_ENUM=247,
    MYSQL_TYPE_SET=248,
@@ -94,7 +94,7 @@ my_bool net_write_command(NET *net,unsigned char command,
      const unsigned char *header, size_t head_len,
      const unsigned char *packet, size_t len);
 int net_real_write(NET *net,const unsigned char *packet, size_t len);
-unsigned long my_net_read(NET *net);
+unsigned long my_net_read_packet(NET *net, my_bool read_from_server);
 struct sockaddr;
 int my_connect(my_socket s, const struct sockaddr *name, unsigned int namelen,
         unsigned int timeout);
@@ -553,7 +553,7 @@ int mysql_list_processes_cont(MYSQL_RES **ret, MYSQL *mysql,
 int mysql_options(MYSQL *mysql,enum mysql_option option,
           const void *arg);
 int mysql_options4(MYSQL *mysql,enum mysql_option option,
-                   const void *arg1, const void *arg2);
+                                       const void *arg1, const void *arg2);
 void mysql_free_result(MYSQL_RES *result);
 int mysql_free_result_start(MYSQL_RES *result);
 int mysql_free_result_cont(MYSQL_RES *result, int status);
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 9486bd3ebb7..43be28f87a0 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -541,7 +541,8 @@ my_bool	net_write_command(NET *net,unsigned char command,
 			  const unsigned char *header, size_t head_len,
 			  const unsigned char *packet, size_t len);
 int	net_real_write(NET *net,const unsigned char *packet, size_t len);
-unsigned long my_net_read(NET *net);
+unsigned long my_net_read_packet(NET *net, my_bool read_from_server);
+#define my_net_read(A) my_net_read_packet((A), 0)
 
 #ifdef MY_GLOBAL_INCLUDED
 void my_net_set_write_timeout(NET *net, uint timeout);
diff --git a/include/thread_pool_priv.h b/include/thread_pool_priv.h
index 449c8ded66b..4270c32c826 100644
--- a/include/thread_pool_priv.h
+++ b/include/thread_pool_priv.h
@@ -1,6 +1,6 @@
 #error don't use
 /*
-  Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by