*Merge.

--HG--
branch : trunk

21 files changed, 21 insertions, 0 deletions

diff --git a/dep/include/mysql/config-netware.h b/dep/include/mysql/config-netware.h
index 0f74ebe7933..0cc47802591 100644
--- a/dep/include/mysql/config-netware.h
+++ b/dep/include/mysql/config-netware.h
@@ -139,3 +139,4 @@ extern "C" {
 #endif
 
 #endif /* _config_netware_h */
+
diff --git a/dep/include/mysql/config-os2.h b/dep/include/mysql/config-os2.h
index b2932c38b5a..440d75af65a 100644
--- a/dep/include/mysql/config-os2.h
+++ b/dep/include/mysql/config-os2.h
@@ -833,3 +833,4 @@ typedef unsigned long long os_off_t;
 /* #undef _LARGE_FILES */
 
 #endif /* __CONFIG_OS2_H__ */
+
diff --git a/dep/include/mysql/config-win.h b/dep/include/mysql/config-win.h
index f23a92385fe..5a4cf162a11 100644
--- a/dep/include/mysql/config-win.h
+++ b/dep/include/mysql/config-win.h
@@ -458,3 +458,4 @@ inline double ulonglong2double(ulonglong value)
 #define HAVE_CHARSET_utf8 1
 #define HAVE_UCA_COLLATIONS 1
 
+
diff --git a/dep/include/mysql/errmsg.h b/dep/include/mysql/errmsg.h
index 627ac7b00cc..720ff7a25ae 100644
--- a/dep/include/mysql/errmsg.h
+++ b/dep/include/mysql/errmsg.h
@@ -100,3 +100,4 @@ extern const char *client_errors[]; /* Error messages */
 #define CR_ERROR_LAST  /*Copy last error nr:*/  2055
 /* Add error numbers before CR_ERROR_LAST and change it accordingly. */
 
+
diff --git a/dep/include/mysql/m_ctype.h b/dep/include/mysql/m_ctype.h
index 218ec2daadb..ac067636b0a 100644
--- a/dep/include/mysql/m_ctype.h
+++ b/dep/include/mysql/m_ctype.h
@@ -519,3 +519,4 @@ my_bool my_charset_is_8bit_pure_ascii(CHARSET_INFO *cs);
 #endif
 
 #endif /* _m_ctype_h */
+
diff --git a/dep/include/mysql/m_string.h b/dep/include/mysql/m_string.h
index c26d0fb9260..445ba18bf41 100644
--- a/dep/include/mysql/m_string.h
+++ b/dep/include/mysql/m_string.h
@@ -264,3 +264,4 @@ extern int my_snprintf(char *to, size_t n, const char *fmt, ...)
 }
 #endif
 #endif
+
diff --git a/dep/include/mysql/my_alloc.h b/dep/include/mysql/my_alloc.h
index 657394a363b..ac56c97456c 100644
--- a/dep/include/mysql/my_alloc.h
+++ b/dep/include/mysql/my_alloc.h
@@ -49,3 +49,4 @@ typedef struct st_mem_root
   void (*error_handler)(void);
 } MEM_ROOT;
 #endif
+
diff --git a/dep/include/mysql/my_dbug.h b/dep/include/mysql/my_dbug.h
index 31fd507ec73..68088e1cc8d 100644
--- a/dep/include/mysql/my_dbug.h
+++ b/dep/include/mysql/my_dbug.h
@@ -105,3 +105,4 @@ extern	void _db_unlock_file(void);
 }
 #endif
 #endif
+
diff --git a/dep/include/mysql/my_getopt.h b/dep/include/mysql/my_getopt.h
index f5688a37231..d5b6ae9e3fe 100644
--- a/dep/include/mysql/my_getopt.h
+++ b/dep/include/mysql/my_getopt.h
@@ -75,3 +75,4 @@ C_MODE_END
 
 #endif /* _my_getopt_h */
 
+
diff --git a/dep/include/mysql/my_global.h b/dep/include/mysql/my_global.h
index 08877300d8a..02bbd30e34a 100644
--- a/dep/include/mysql/my_global.h
+++ b/dep/include/mysql/my_global.h
@@ -1352,3 +1352,4 @@ do { doubleget_union _tmp; \
 #define MY_INT64_NUM_DECIMAL_DIGITS 21
 
 #endif /* my_global_h */
+
diff --git a/dep/include/mysql/my_list.h b/dep/include/mysql/my_list.h
index 4a1737d4c53..bdb0a89c4f5 100644
--- a/dep/include/mysql/my_list.h
+++ b/dep/include/mysql/my_list.h
@@ -43,3 +43,4 @@ extern int list_walk(LIST *,list_walk_action action,gptr argument);
 }
 #endif
 #endif
+
diff --git a/dep/include/mysql/my_pthread.h b/dep/include/mysql/my_pthread.h
index 13b7cf93d6f..2c734952ccd 100644
--- a/dep/include/mysql/my_pthread.h
+++ b/dep/include/mysql/my_pthread.h
@@ -797,3 +797,4 @@ extern uint thd_lib_detected;
 }
 #endif
 #endif /* _my_ptread_h */
+
diff --git a/dep/include/mysql/my_sys.h b/dep/include/mysql/my_sys.h
index d656326e968..cafdf571968 100644
--- a/dep/include/mysql/my_sys.h
+++ b/dep/include/mysql/my_sys.h
@@ -934,3 +934,4 @@ void netware_reg_user(const char *ip, const char *user,
 C_MODE_END
 #include "raid.h"
 #endif /* _my_sys_h */
+
diff --git a/dep/include/mysql/mysql.h b/dep/include/mysql/mysql.h
index 1f106429f0d..4d4a3eb67c9 100644
--- a/dep/include/mysql/mysql.h
+++ b/dep/include/mysql/mysql.h
@@ -869,3 +869,4 @@ int     STDCALL mysql_drop_db(MYSQL *mysql, const char *DB);
 #endif
 
 #endif /* _mysql_h */
+
diff --git a/dep/include/mysql/mysql_com.h b/dep/include/mysql/mysql_com.h
index 94b34c1c3f0..0669a7e0d02 100644
--- a/dep/include/mysql/mysql_com.h
+++ b/dep/include/mysql/mysql_com.h
@@ -465,3 +465,4 @@ char *net_store_length(char *pkg, ulonglong length);
 #define MYSQL_LONG_DATA_HEADER  6
 
 #endif
+
diff --git a/dep/include/mysql/mysql_embed.h b/dep/include/mysql/mysql_embed.h
index 7416283d83d..2e44c99a192 100644
--- a/dep/include/mysql/mysql_embed.h
+++ b/dep/include/mysql/mysql_embed.h
@@ -29,3 +29,4 @@
 #define DONT_USE_RAID
 
 #endif /* EMBEDDED_LIBRARY */
+
diff --git a/dep/include/mysql/mysql_time.h b/dep/include/mysql/mysql_time.h
index 0a3f17a81fb..6dce2fd02c7 100644
--- a/dep/include/mysql/mysql_time.h
+++ b/dep/include/mysql/mysql_time.h
@@ -53,3 +53,4 @@ typedef struct st_mysql_time
 } MYSQL_TIME;
 
 #endif /* _mysql_time_h_ */
+
diff --git a/dep/include/mysql/mysql_version.h b/dep/include/mysql/mysql_version.h
index 3ec91e40930..0628c9fb331 100644
--- a/dep/include/mysql/mysql_version.h
+++ b/dep/include/mysql/mysql_version.h
@@ -28,3 +28,4 @@
 #endif /* LICENSE */
 
 #endif /* _mysql_version_h */
+
diff --git a/dep/include/mysql/mysqld_error.h b/dep/include/mysql/mysqld_error.h
index 591ff78c5e1..b200fdc84d6 100644
--- a/dep/include/mysql/mysqld_error.h
+++ b/dep/include/mysql/mysqld_error.h
@@ -478,3 +478,4 @@
 #define ER_NAME_BECOMES_EMPTY 1474
 #define ER_AMBIGUOUS_FIELD_TERM 1475
 #define ER_ERROR_LAST 1475
+
diff --git a/dep/include/mysql/raid.h b/dep/include/mysql/raid.h
index c3b256042f5..77e668c35b2 100644
--- a/dep/include/mysql/raid.h
+++ b/dep/include/mysql/raid.h
@@ -156,3 +156,4 @@ class RaidFd {
 
 #endif /* __cplusplus */
 #endif /* USE_RAID */
+
diff --git a/dep/include/mysql/typelib.h b/dep/include/mysql/typelib.h
index 2a62f344cd0..40d69b89e34 100644
--- a/dep/include/mysql/typelib.h
+++ b/dep/include/mysql/typelib.h
@@ -34,3 +34,4 @@ extern TYPELIB *copy_typelib(MEM_ROOT *root, TYPELIB *from);
 extern TYPELIB sql_protocol_typelib;
 
 #endif /* _typelib_h */
+