diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-17 14:55:26 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-17 15:15:45 +0200 |
| commit | 15990d8ccbd4e89770b449444ac430650ca6a381 (patch) | |
| tree | 132bb516c78ba22be0972a068ab56cc8101151d1 /libmariadb | |
| parent | 7828f4377033f8dcceb8ff9368b6d613a1dd7b2b (diff) | |
libmariadb: fix wrong line ends in patch
Change-Id: I8fce7d3b3da2a6dad373409f9c9ba3b9cd06aa4f
Diffstat (limited to 'libmariadb')
| -rw-r--r-- | libmariadb/UnpackedTarball_mariadb.mk | 4 | ||||
| -rw-r--r-- | libmariadb/mariadb-trunk-40.patch | 52 |
2 files changed, 30 insertions, 26 deletions
diff --git a/libmariadb/UnpackedTarball_mariadb.mk b/libmariadb/UnpackedTarball_mariadb.mk index f80bed6d1982..f8694abeb97b 100644 --- a/libmariadb/UnpackedTarball_mariadb.mk +++ b/libmariadb/UnpackedTarball_mariadb.mk @@ -33,4 +33,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,mariadb,\ libmariadb/mariadb-static-inline.patch \ )) +$(eval $(call gb_UnpackedTarball_fix_end_of_line,mariadb,\ + libmysql/libmysql_exports.def \ +)) + # vim: set noet sw=4 ts=4: diff --git a/libmariadb/mariadb-trunk-40.patch b/libmariadb/mariadb-trunk-40.patch index a0082bc2beed..de8f44ca2c10 100644 --- a/libmariadb/mariadb-trunk-40.patch +++ b/libmariadb/mariadb-trunk-40.patch @@ -3373,34 +3373,34 @@ --- mariadb/libmysql/libmysql_exports.def 2012-11-28 13:09:17 +0000 +++ mariadb/libmariadb/libmariadb_exports.def 2013-03-14 21:01:43 +0000 @@ -1,4 +1,5 @@ - EXPORTS
-+ mysql_ps_fetch_functions DATA
- get_tty_password
- load_defaults
- mysql_thread_end
+ EXPORTS ++ mysql_ps_fetch_functions DATA + get_tty_password + load_defaults + mysql_thread_end @@ -53,11 +54,10 @@ - mysql_num_rows
- mysql_options
- mysql_stmt_param_count
-- ;mysql_stmt_param_metadata
-+ mysql_stmt_param_metadata
- mysql_ping
- mysql_stmt_result_metadata
- mysql_query
-- mysql_read_query_result
- mysql_real_connect
- mysql_real_escape_string
- mysql_real_query
+ mysql_num_rows + mysql_options + mysql_stmt_param_count +- ;mysql_stmt_param_metadata ++ mysql_stmt_param_metadata + mysql_ping + mysql_stmt_result_metadata + mysql_query +- mysql_read_query_result + mysql_real_connect + mysql_real_escape_string + mysql_real_query @@ -102,6 +102,6 @@ - mysql_server_end
- mysql_set_character_set
- mysql_get_character_set_info
-- ;mysql_stmt_next_result
--
--
-+ mysql_stmt_next_result
-+ mariadb_connection
-+ mysql_get_server_name
+ mysql_server_end + mysql_set_character_set + mysql_get_character_set_info +- ;mysql_stmt_next_result +- +- ++ mysql_stmt_next_result ++ mariadb_connection ++ mysql_get_server_name === renamed file 'libmysql/my_secure.c' => 'libmariadb/ma_secure.c' --- mariadb/libmysql/my_secure.c 2012-11-26 07:32:41 +0000 |