Created
August 20, 2010 09:49
-
-
Save SkirnirMaNGOS/539991 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/dep/include/mysql/keycache.h b/dep/include/mysql/keycache.h | |
index a6005ba..9fc84e7 100644 | |
--- a/dep/include/mysql/keycache.h | |
+++ b/dep/include/mysql/keycache.h | |
@@ -39,7 +39,7 @@ typedef struct st_keycache_wqueue | |
/* | |
The key cache structure | |
It also contains read-only statistics parameters. | |
-*/ | |
+*/ | |
typedef struct st_key_cache | |
{ | |
diff --git a/dep/include/mysql/m_ctype.h b/dep/include/mysql/m_ctype.h | |
index 451c8db..378b938 100644 | |
--- a/dep/include/mysql/m_ctype.h | |
+++ b/dep/include/mysql/m_ctype.h | |
@@ -84,8 +84,8 @@ extern MY_UNI_CTYPE my_uni_ctype[256]; | |
#define MY_CS_UNICODE 128 /* is a charset is full unicode */ | |
#define MY_CS_READY 256 /* if a charset is initialized */ | |
#define MY_CS_AVAILABLE 512 /* If either compiled-in or loaded*/ | |
-#define MY_CS_CSSORT 1024 /* if case sensitive sort order */ | |
-#define MY_CS_HIDDEN 2048 /* don't display in SHOW */ | |
+#define MY_CS_CSSORT 1024 /* if case sensitive sort order */ | |
+#define MY_CS_HIDDEN 2048 /* don't display in SHOW */ | |
#define MY_CS_PUREASCII 4096 /* if a charset is pure ascii */ | |
#define MY_CHARSET_UNDEFINED 0 | |
@@ -140,7 +140,7 @@ typedef struct my_collation_handler_st | |
my_bool diff_if_only_endspace_difference); | |
size_t (*strnxfrm)(struct charset_info_st *, | |
uchar *, size_t, const uchar *, size_t); | |
- size_t (*strnxfrmlen)(struct charset_info_st *, size_t); | |
+ size_t (*strnxfrmlen)(struct charset_info_st *, size_t); | |
my_bool (*like_range)(struct charset_info_st *, | |
const char *s, size_t s_length, | |
pchar w_prefix, pchar w_one, pchar w_many, | |
@@ -319,8 +319,8 @@ extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_filename; | |
/* declarations for simple charsets */ | |
extern size_t my_strnxfrm_simple(CHARSET_INFO *, uchar *, size_t, | |
- const uchar *, size_t); | |
-size_t my_strnxfrmlen_simple(CHARSET_INFO *, size_t); | |
+ const uchar *, size_t); | |
+size_t my_strnxfrmlen_simple(CHARSET_INFO *, size_t); | |
extern int my_strnncoll_simple(CHARSET_INFO *, const uchar *, size_t, | |
const uchar *, size_t, my_bool); | |
diff --git a/dep/include/mysql/my_dir.h b/dep/include/mysql/my_dir.h | |
index 06509a3..2934099 100644 | |
--- a/dep/include/mysql/my_dir.h | |
+++ b/dep/include/mysql/my_dir.h | |
@@ -83,7 +83,7 @@ typedef struct fileinfo | |
typedef struct st_my_dir /* Struct returned from my_dir */ | |
{ | |
/* | |
- These members are just copies of parts of DYNAMIC_ARRAY structure, | |
+ These members are just copies of parts of DYNAMIC_ARRAY structure, | |
which is allocated right after the end of MY_DIR structure (MEM_ROOT | |
for storing names is also resides there). We've left them here because | |
we don't want to change code that uses my_dir. | |
diff --git a/dep/include/mysql/my_global.h b/dep/include/mysql/my_global.h | |
index e13c7c3..55191a8 100644 | |
--- a/dep/include/mysql/my_global.h | |
+++ b/dep/include/mysql/my_global.h | |
@@ -562,11 +562,11 @@ int __void__; | |
#define LINT_INIT(var) | |
#endif | |
-/* | |
+/* | |
Suppress uninitialized variable warning without generating code. | |
The _cplusplus is a temporary workaround for C++ code pending a fix | |
- for a g++ bug (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=34772). | |
+ for a g++ bug (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=34772). | |
*/ | |
#if defined(_lint) || defined(FORCE_INIT_OF_VARS) || defined(__cplusplus) || \ | |
!defined(__GNUC__) | |
@@ -1542,7 +1542,7 @@ inline void operator delete[](void*, void*) { /* Do nothing */ } | |
#if !defined(max) | |
#define max(a, b) ((a) > (b) ? (a) : (b)) | |
#define min(a, b) ((a) < (b) ? (a) : (b)) | |
-#endif | |
+#endif | |
/* | |
Only Linux is known to need an explicit sync of the directory to make sure a | |
file creation/deletion/renaming in(from,to) this directory durable. | |
@@ -1590,7 +1590,7 @@ static inline double rint(double x) | |
} | |
#endif /* HAVE_RINT */ | |
-/* | |
+/* | |
MYSQL_PLUGIN_IMPORT macro is used to export mysqld data | |
(i.e variables) for usage in storage engine loadable plugins. | |
Outside of Windows, it is dummy. | |
diff --git a/dep/include/mysql/my_pthread.h b/dep/include/mysql/my_pthread.h | |
index e925661..4ec22ea 100644 | |
--- a/dep/include/mysql/my_pthread.h | |
+++ b/dep/include/mysql/my_pthread.h | |
@@ -535,7 +535,7 @@ typedef struct st_my_pthread_fastmutex_t | |
} my_pthread_fastmutex_t; | |
void fastmutex_global_init(void); | |
-int my_pthread_fastmutex_init(my_pthread_fastmutex_t *mp, | |
+int my_pthread_fastmutex_init(my_pthread_fastmutex_t *mp, | |
const pthread_mutexattr_t *attr); | |
int my_pthread_fastmutex_lock(my_pthread_fastmutex_t *mp); | |
diff --git a/dep/include/mysql/my_sys.h b/dep/include/mysql/my_sys.h | |
index 3a240cf..7ad4d9b 100644 | |
--- a/dep/include/mysql/my_sys.h | |
+++ b/dep/include/mysql/my_sys.h | |
@@ -808,7 +808,7 @@ File create_temp_file(char *to, const char *dir, const char *pfx, | |
#define my_init_dynamic_array2(A,B,C,D,E) init_dynamic_array2(A,B,C,D,E CALLER_INFO) | |
#define my_init_dynamic_array2_ci(A,B,C,D,E) init_dynamic_array2(A,B,C,D,E ORIG_CALLER_INFO) | |
extern my_bool init_dynamic_array2(DYNAMIC_ARRAY *array,uint element_size, | |
- void *init_buffer, uint init_alloc, | |
+ void *init_buffer, uint init_alloc, | |
uint alloc_increment | |
CALLER_INFO_PROTO); | |
/* init_dynamic_array() function is deprecated */ | |
diff --git a/dep/include/mysql/my_xml.h b/dep/include/mysql/my_xml.h | |
index 6a453ee..2ea1ed3 100644 | |
--- a/dep/include/mysql/my_xml.h | |
+++ b/dep/include/mysql/my_xml.h | |
@@ -25,7 +25,7 @@ extern "C" { | |
#define MY_XML_OK 0 | |
#define MY_XML_ERROR 1 | |
-/* | |
+/* | |
A flag whether to use absolute tag names in call-back functions, | |
like "a", "a.b" and "a.b.c" (used in character set file parser), | |
or relative names like "a", "b" and "c". | |
diff --git a/dep/include/mysql/mysql_com.h b/dep/include/mysql/mysql_com.h | |
index 7d3dd3d..f3db58e 100644 | |
--- a/dep/include/mysql/mysql_com.h | |
+++ b/dep/include/mysql/mysql_com.h | |
@@ -199,7 +199,7 @@ enum enum_server_command | |
#define SERVER_STATUS_NO_BACKSLASH_ESCAPES 512 | |
/** | |
Sent to the client if after a prepared statement reprepare | |
- we discovered that the new statement returns a different | |
+ we discovered that the new statement returns a different | |
number of result set columns. | |
*/ | |
#define SERVER_STATUS_METADATA_CHANGED 1024 | |
@@ -208,8 +208,8 @@ enum enum_server_command | |
Server status flags that must be cleared when starting | |
execution of a new SQL statement. | |
Flags from this set are only added to the | |
- current server status by the execution engine, but | |
- never removed -- the execution engine expects them | |
+ current server status by the execution engine, but | |
+ never removed -- the execution engine expects them | |
to disappear automagically by the next command. | |
*/ | |
#define SERVER_STATUS_CLEAR_SET (SERVER_QUERY_NO_GOOD_INDEX_USED| \ | |
@@ -269,7 +269,7 @@ typedef struct st_net { | |
*/ | |
unsigned char *query_cache_query; | |
unsigned int last_errno; | |
- unsigned char error; | |
+ unsigned char error; | |
my_bool unused2; /* Please remove with the next incompatible ABI change. */ | |
my_bool return_errno; | |
/** Client library error message buffer. Actually belongs to struct MYSQL. */ | |
diff --git a/dep/include/mysql/sql_common.h b/dep/include/mysql/sql_common.h | |
index 9e43d07..075c917 100644 | |
--- a/dep/include/mysql/sql_common.h | |
+++ b/dep/include/mysql/sql_common.h | |
@@ -1,14 +1,14 @@ | |
/* Copyright (C) 2003-2004, 2006 MySQL AB | |
- | |
+ | |
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 | |
the Free Software Foundation; version 2 of the License. | |
- | |
+ | |
This program is distributed in the hope that it will be useful, | |
but WITHOUT ANY WARRANTY; without even the implied warranty of | |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
GNU General Public License for more details. | |
- | |
+ | |
You should have received a copy of the GNU General Public License | |
along with this program; if not, write to the Free Software | |
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment