5.3->5.5 merge

9 files changed, 31 insertions, 16 deletions

diff --git a/include/ma_dyncol.h b/include/ma_dyncol.h
index 687823a4e73..6174328d62a 100644
--- a/include/ma_dyncol.h
+++ b/include/ma_dyncol.h
@@ -79,15 +79,15 @@ struct st_dynamic_column_value
     unsigned long long ulong_value;
     double double_value;
     struct {
-      LEX_STRING string_value;
+      LEX_STRING value;
       CHARSET_INFO *charset;
-    };
+    } string;
     struct {
-      decimal_digit_t decimal_buffer[DECIMAL_BUFF_LENGTH];
-      decimal_t decimal_value;
-    };
+      decimal_digit_t buffer[DECIMAL_BUFF_LENGTH];
+      decimal_t value;
+    } decimal;
     MYSQL_TIME time_value;
-  };
+  } x;
 };
 
 typedef struct st_dynamic_column_value DYNAMIC_COLUMN_VALUE;
diff --git a/include/maria.h b/include/maria.h
index 08febdb1a40..3ee5b6b9df8 100644
--- a/include/maria.h
+++ b/include/maria.h
@@ -461,6 +461,8 @@ void maria_change_pagecache(PAGECACHE *old_key_cache,
 int maria_preload(MARIA_HA *info, ulonglong key_map, my_bool ignore_leaves);
 void maria_versioning(MARIA_HA *info, my_bool versioning);
 void maria_ignore_trids(MARIA_HA *info);
+uint maria_max_key_length(void);
+#define maria_max_key_segments() HA_MAX_KEY_SEG
 
 /* fulltext functions */
 FT_INFO *maria_ft_init_search(uint,void *, uint, uchar *, size_t,
diff --git a/include/my_bitmap.h b/include/my_bitmap.h
index 0edda50de05..7b78252ea27 100644
--- a/include/my_bitmap.h
+++ b/include/my_bitmap.h
@@ -55,6 +55,10 @@ extern my_bool bitmap_test_and_clear(MY_BITMAP *map, uint bitmap_bit);
 extern my_bool bitmap_fast_test_and_set(MY_BITMAP *map, uint bitmap_bit);
 extern my_bool bitmap_union_is_set_all(const MY_BITMAP *map1,
                                        const MY_BITMAP *map2);
+extern my_bool bitmap_exists_intersection(const MY_BITMAP **bitmap_array,
+                                          uint bitmap_count,
+                                          uint start_bit, uint end_bit);
+
 extern uint bitmap_set_next(MY_BITMAP *map);
 extern uint bitmap_get_first(const MY_BITMAP *map);
 extern uint bitmap_get_first_set(const MY_BITMAP *map);
diff --git a/include/my_compare.h b/include/my_compare.h
index 39186e40a15..b47eb65199e 100644
--- a/include/my_compare.h
+++ b/include/my_compare.h
@@ -135,6 +135,8 @@ extern HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, const uchar *a);
                       if we're scanning "t.key BETWEEN 10 AND 20" and got a
                       "t.key=21" tuple (the engine should stop scanning and
                       return HA_ERR_END_OF_FILE right away).
+  3=ICP_ABORTED_BY_USER - engine must stop scanning and should return 
+                         HA_ERR_ABORTED_BY_USER right away
  -1= ICP_ERROR    - Reserved for internal errors in engines. Should not be
                     returned by index_cond_func_xxx
 */
@@ -143,7 +145,8 @@ typedef enum icp_result {
   ICP_ERROR=-1,
   ICP_NO_MATCH=0,
   ICP_MATCH=1,
-  ICP_OUT_OF_RANGE=2
+  ICP_OUT_OF_RANGE=2,
+  ICP_ABORTED_BY_USER=3
 } ICP_RESULT;
 
 typedef ICP_RESULT (*index_cond_func_t)(void *param);
diff --git a/include/my_sys.h b/include/my_sys.h
index ca27e0f76a5..554ee487a4f 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -63,7 +63,6 @@ typedef struct my_aio_result {
 #define MY_WME		16	/* Write message on error */
 #define MY_WAIT_IF_FULL 32	/* Wait and try again if disk full error */
 #define MY_IGNORE_BADFD 32      /* my_sync: ignore 'bad descriptor' errors */
-#define MY_SYNC_DIR     8192    /* my_create/delete/rename: sync directory */
 #define MY_UNUSED       64      /* Unused (was support for RAID) */
 #define MY_FULL_IO     512      /* For my_read - loop intil I/O is complete */
 #define MY_DONT_CHECK_FILESIZE 128 /* Option to init_io_cache() */
@@ -84,6 +83,7 @@ typedef struct my_aio_result {
 #define MY_DONT_OVERWRITE_FILE 2048 /* my_copy: Don't overwrite file */
 #define MY_THREADSAFE 2048      /* my_seek(): lock fd mutex */
 #define MY_SYNC       4096      /* my_copy(): sync dst file */
+#define MY_SYNC_DIR   32768     /* my_create/delete/rename: sync directory */
 
 #define MY_CHECK_ERROR	1	/* Params to my_end; Check open-close */
 #define MY_GIVE_INFO	2	/* Give time info about process*/
@@ -233,7 +233,8 @@ extern ulong    my_file_total_opened;
 extern ulong    my_sync_count;
 extern uint	mysys_usage_id;
 extern my_bool	my_init_done;
-
+extern my_bool  my_assert_on_error;
+extern myf      my_global_flags;        /* Set to MY_WME for more error messages */
 					/* Point to current my_message() */
 extern void (*my_sigtstp_cleanup)(void),
 					/* Executed before jump to shell */
diff --git a/include/myisam.h b/include/myisam.h
index 9e843e176eb..0aa8fe79c27 100644
--- a/include/myisam.h
+++ b/include/myisam.h
@@ -292,6 +292,8 @@ extern ulong _mi_calc_blob_length(uint length , const uchar *pos);
 extern uint mi_get_pointer_length(ulonglong file_length, uint def);
 extern int mi_make_backup_of_index(struct st_myisam_info *info,
                                    time_t backup_time, myf flags);
+#define myisam_max_key_length() HA_MAX_KEY_LENGTH
+#define myisam_max_key_segments() HA_MAX_KEY_SEG
 
 #define MEMMAP_EXTRA_MARGIN     7       /* Write this as a suffix for mmap file */
 /* this is used to pass to mysql_myisamchk_table */
diff --git a/include/myisamchk.h b/include/myisamchk.h
index bd184c75e7e..9478936c748 100644
--- a/include/myisamchk.h
+++ b/include/myisamchk.h
@@ -144,7 +144,7 @@ typedef struct st_handler_check_param
   time_t backup_time;                           /* To sign backup files */
   ulong rec_per_key_part[HA_MAX_KEY_SEG * HA_MAX_POSSIBLE_KEY];
   double new_rec_per_key_part[HA_MAX_KEY_SEG * HA_MAX_POSSIBLE_KEY];
-  uint out_flag, warning_printed, error_printed, verbose;
+  uint out_flag, warning_printed, error_printed, note_printed, verbose;
   uint opt_sort_key, total_files, max_level;
   uint key_cache_block_size, pagecache_block_size;
   int tmpfile_createflag, err_count;
diff --git a/include/mysql.h.pp b/include/mysql.h.pp
index eed977aff50..556ba91c7b9 100644
--- a/include/mysql.h.pp
+++ b/include/mysql.h.pp
@@ -67,8 +67,8 @@ enum mysql_enum_shutdown_level {
   SHUTDOWN_WAIT_UPDATES= (unsigned char)(1 << 3),
   SHUTDOWN_WAIT_ALL_BUFFERS= ((unsigned char)(1 << 3) << 1),
   SHUTDOWN_WAIT_CRITICAL_BUFFERS= ((unsigned char)(1 << 3) << 1) + 1,
-  KILL_QUERY= 254,
-  KILL_CONNECTION= 255
+  SHUTDOWN_KILL_QUERY= 254,
+  SHUTDOWN_KILL_CONNECTION= 255
 };
 enum enum_cursor_type
 {
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 57e84dc4e08..adba1ba141a 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -428,12 +428,15 @@ enum mysql_enum_shutdown_level {
   /* don't flush InnoDB buffers, flush other storage engines' buffers*/
   SHUTDOWN_WAIT_CRITICAL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1) + 1,
   /* Now the 2 levels of the KILL command */
-#if MYSQL_VERSION_ID >= 50000
-  KILL_QUERY= 254,
-#endif
-  KILL_CONNECTION= 255
+  SHUTDOWN_KILL_QUERY= 254,
+  SHUTDOWN_KILL_CONNECTION= 255
 };
 
+/* Compatibility */
+#if !defined(MYSQL_SERVER) && defined(USE_OLD_FUNCTIONS)
+#define KILL_QUERY SHUTDOWN_KILL_QUERY
+#define KILL_CONNECTION SHUTDOWN_KILL_CONNECTION
+#endif
 
 enum enum_cursor_type
 {