diff options
| author | Andras Timar <andras.timar@collabora.com> | 2013-12-20 11:25:37 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2013-12-20 15:55:00 +0100 |
| commit | b55259eeb549482477c57d854f3de72aff345edb (patch) | |
| tree | 35e474b8458ae776a8455f4f78e73ae28c611180 /external | |
| parent | 377ec698afc98a9a098b456f4ae3c694498df6a2 (diff) | |
typo fixes
Change-Id: Ia5f104bfd707bcf4e159c78ca2764c861fb0b6d9
Diffstat (limited to 'external')
| -rw-r--r-- | external/libmariadb/mariadb-trunk-101.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/external/libmariadb/mariadb-trunk-101.patch b/external/libmariadb/mariadb-trunk-101.patch index 228bddc04776..2216d213d261 100644 --- a/external/libmariadb/mariadb-trunk-101.patch +++ b/external/libmariadb/mariadb-trunk-101.patch @@ -21601,7 +21601,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/libmariadb/my_auth. + to send data to the server. + + It transparently wraps the data into a change user or authentication -+ handshake packet, if neccessary. ++ handshake packet, if necessary. +*/ + +static int client_mpvio_write_packet(struct st_plugin_vio *mpv, @@ -31835,7 +31835,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/libmariadb/strmake. + return dst+length; +} + -+#define strmake strmake_overlapp /* Use orginal for overlapping str */ ++#define strmake strmake_overlapp /* Use original for overlapping str */ +#endif + +char *strmake(register char *dst, register const char *src, size_t length) @@ -36192,7 +36192,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/libmysql/dbug.c mar - * Given name of a new file, opens the file - * and sets the profiler output stream to the new file. - * -- * It is currently unclear whether the prefered behavior is +- * It is currently unclear whether the preferred behavior is - * to truncate any existing file, or simply append to it. - * The latter behavior would be desirable for collecting - * accumulated runtime history over a number of separate @@ -44246,7 +44246,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/libmysql/my_auth.c - to send data to the server. - - It transparently wraps the data into a change user or authentication -- handshake packet, if neccessary. +- handshake packet, if necessary. -*/ - -static int client_mpvio_write_packet(struct st_plugin_vio *mpv, @@ -55414,7 +55414,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/libmysql/strmake.c - return dst+length; -} - --#define strmake strmake_overlapp /* Use orginal for overlapping str */ +-#define strmake strmake_overlapp /* Use original for overlapping str */ -#endif - -char *strmake(register char *dst, register const char *src, size_t length) @@ -93352,7 +93352,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/plugins/sqlite/sqli +** This file implements the default page cache implementation (the +** sqlite3_pcache interface). It also contains part of the implementation +** of the SQLITE_CONFIG_PAGECACHE and sqlite3_release_memory() features. -+** If the default page cache implementation is overriden, then neither of ++** If the default page cache implementation is overridden, then neither of +** these two features are available. +*/ + @@ -171005,7 +171005,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/plugins/sqlite/sqli +/* +** Another built-in collating sequence: NOCASE. +** -+** This collating sequence is intended to be used for "case independant ++** This collating sequence is intended to be used for "case independent +** comparison". SQLite's knowledge of upper and lower case equivalents +** extends only to the 26 characters used in the English language. +** |