Attachment 912681 Details for Bug 1111776 – patch that adds alternative version for symbols

[patch] patch that adds alternative version for symbols

bz1111776.patch (text/plain), 7.74 KB, created by Honza Horak on 2014-06-27 06:27:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Honza Horak

Created: 2014-06-27 06:27:11 UTC

Size: 7.74 KB

patch

obsolete

>diff --git a/libmysql.version b/libmysql.version
>index d0e329c..a40e005 100644
>--- a/libmysql.version
>+++ b/libmysql.version
>@@ -1,4 +1,121 @@
>-# symbols exported from mysql 5.1
>+/*
>+ * symbols exported from mysql 5.1
>+ */
>+
>+/* alternative names to be compatible with newer builds of the same library */
>+
>+"my_init@libmysqlclient_18" = my_init;
>+"myodbc_remove_escape@libmysqlclient_18" = myodbc_remove_escape;
>+"mysql_affected_rows@libmysqlclient_18" = mysql_affected_rows;
>+"mysql_autocommit@libmysqlclient_18" = mysql_autocommit;
>+"mysql_change_user@libmysqlclient_18" = mysql_change_user;
>+"mysql_character_set_name@libmysqlclient_18" = mysql_character_set_name;
>+"mysql_close@libmysqlclient_18" = mysql_close;
>+"mysql_commit@libmysqlclient_18" = mysql_commit;
>+"mysql_data_seek@libmysqlclient_18" = mysql_data_seek;
>+"mysql_debug@libmysqlclient_18" = mysql_debug;
>+"mysql_dump_debug_info@libmysqlclient_18" = mysql_dump_debug_info;
>+"mysql_embedded@libmysqlclient_18" = mysql_embedded;
>+"mysql_eof@libmysqlclient_18" = mysql_eof;
>+"mysql_errno@libmysqlclient_18" = mysql_errno;
>+"mysql_error@libmysqlclient_18" = mysql_error;
>+"mysql_escape_string@libmysqlclient_18" = mysql_escape_string;
>+"mysql_fetch_field@libmysqlclient_18" = mysql_fetch_field;
>+"mysql_fetch_field_direct@libmysqlclient_18" = mysql_fetch_field_direct;
>+"mysql_fetch_fields@libmysqlclient_18" = mysql_fetch_fields;
>+"mysql_fetch_lengths@libmysqlclient_18" = mysql_fetch_lengths;
>+"mysql_fetch_row@libmysqlclient_18" = mysql_fetch_row;
>+"mysql_field_count@libmysqlclient_18" = mysql_field_count;
>+"mysql_field_seek@libmysqlclient_18" = mysql_field_seek;
>+"mysql_field_tell@libmysqlclient_18" = mysql_field_tell;
>+"mysql_free_result@libmysqlclient_18" = mysql_free_result;
>+"mysql_get_character_set_info@libmysqlclient_18" = mysql_get_character_set_info;
>+"mysql_get_client_info@libmysqlclient_18" = mysql_get_client_info;
>+"mysql_get_client_version@libmysqlclient_18" = mysql_get_client_version;
>+"mysql_get_host_info@libmysqlclient_18" = mysql_get_host_info;
>+"mysql_get_parameters@libmysqlclient_18" = mysql_get_parameters;
>+"mysql_get_proto_info@libmysqlclient_18" = mysql_get_proto_info;
>+"mysql_get_server_info@libmysqlclient_18" = mysql_get_server_info;
>+"mysql_get_server_version@libmysqlclient_18" = mysql_get_server_version;
>+"mysql_get_ssl_cipher@libmysqlclient_18" = mysql_get_ssl_cipher;
>+"mysql_hex_string@libmysqlclient_18" = mysql_hex_string;
>+"mysql_info@libmysqlclient_18" = mysql_info;
>+"mysql_init@libmysqlclient_18" = mysql_init;
>+"mysql_insert_id@libmysqlclient_18" = mysql_insert_id;
>+"mysql_kill@libmysqlclient_18" = mysql_kill;
>+"mysql_list_dbs@libmysqlclient_18" = mysql_list_dbs;
>+"mysql_list_fields@libmysqlclient_18" = mysql_list_fields;
>+"mysql_list_processes@libmysqlclient_18" = mysql_list_processes;
>+"mysql_list_tables@libmysqlclient_18" = mysql_list_tables;
>+"mysql_more_results@libmysqlclient_18" = mysql_more_results;
>+"mysql_next_result@libmysqlclient_18" = mysql_next_result;
>+"mysql_num_fields@libmysqlclient_18" = mysql_num_fields;
>+"mysql_num_rows@libmysqlclient_18" = mysql_num_rows;
>+"mysql_options@libmysqlclient_18" = mysql_options;
>+"mysql_ping@libmysqlclient_18" = mysql_ping;
>+"mysql_query@libmysqlclient_18" = mysql_query;
>+"mysql_read_query_result@libmysqlclient_18" = mysql_read_query_result;
>+"mysql_real_connect@libmysqlclient_18" = mysql_real_connect;
>+"mysql_real_escape_string@libmysqlclient_18" = mysql_real_escape_string;
>+"mysql_real_query@libmysqlclient_18" = mysql_real_query;
>+"mysql_refresh@libmysqlclient_18" = mysql_refresh;
>+"mysql_rollback@libmysqlclient_18" = mysql_rollback;
>+"mysql_row_seek@libmysqlclient_18" = mysql_row_seek;
>+"mysql_row_tell@libmysqlclient_18" = mysql_row_tell;
>+"mysql_select_db@libmysqlclient_18" = mysql_select_db;
>+"mysql_send_query@libmysqlclient_18" = mysql_send_query;
>+"mysql_server_end@libmysqlclient_18" = mysql_server_end;
>+"mysql_server_init@libmysqlclient_18" = mysql_server_init;
>+"mysql_set_character_set@libmysqlclient_18" = mysql_set_character_set;
>+"mysql_set_local_infile_default@libmysqlclient_18" = mysql_set_local_infile_default;
>+"mysql_set_local_infile_handler@libmysqlclient_18" = mysql_set_local_infile_handler;
>+"mysql_set_server_option@libmysqlclient_18" = mysql_set_server_option;
>+"mysql_shutdown@libmysqlclient_18" = mysql_shutdown;
>+"mysql_sqlstate@libmysqlclient_18" = mysql_sqlstate;
>+"mysql_ssl_set@libmysqlclient_18" = mysql_ssl_set;
>+"mysql_stat@libmysqlclient_18" = mysql_stat;
>+"mysql_stmt_affected_rows@libmysqlclient_18" = mysql_stmt_affected_rows;
>+"mysql_stmt_attr_get@libmysqlclient_18" = mysql_stmt_attr_get;
>+"mysql_stmt_attr_set@libmysqlclient_18" = mysql_stmt_attr_set;
>+"mysql_stmt_bind_param@libmysqlclient_18" = mysql_stmt_bind_param;
>+"mysql_stmt_bind_result@libmysqlclient_18" = mysql_stmt_bind_result;
>+"mysql_stmt_close@libmysqlclient_18" = mysql_stmt_close;
>+"mysql_stmt_data_seek@libmysqlclient_18" = mysql_stmt_data_seek;
>+"mysql_stmt_errno@libmysqlclient_18" = mysql_stmt_errno;
>+"mysql_stmt_error@libmysqlclient_18" = mysql_stmt_error;
>+"mysql_stmt_execute@libmysqlclient_18" = mysql_stmt_execute;
>+"mysql_stmt_fetch@libmysqlclient_18" = mysql_stmt_fetch;
>+"mysql_stmt_fetch_column@libmysqlclient_18" = mysql_stmt_fetch_column;
>+"mysql_stmt_field_count@libmysqlclient_18" = mysql_stmt_field_count;
>+"mysql_stmt_free_result@libmysqlclient_18" = mysql_stmt_free_result;
>+"mysql_stmt_init@libmysqlclient_18" = mysql_stmt_init;
>+"mysql_stmt_insert_id@libmysqlclient_18" = mysql_stmt_insert_id;
>+"mysql_stmt_num_rows@libmysqlclient_18" = mysql_stmt_num_rows;
>+"mysql_stmt_param_count@libmysqlclient_18" = mysql_stmt_param_count;
>+"mysql_stmt_param_metadata@libmysqlclient_18" = mysql_stmt_param_metadata;
>+"mysql_stmt_prepare@libmysqlclient_18" = mysql_stmt_prepare;
>+"mysql_stmt_reset@libmysqlclient_18" = mysql_stmt_reset;
>+"mysql_stmt_result_metadata@libmysqlclient_18" = mysql_stmt_result_metadata;
>+"mysql_stmt_row_seek@libmysqlclient_18" = mysql_stmt_row_seek;
>+"mysql_stmt_row_tell@libmysqlclient_18" = mysql_stmt_row_tell;
>+"mysql_stmt_send_long_data@libmysqlclient_18" = mysql_stmt_send_long_data;
>+"mysql_stmt_sqlstate@libmysqlclient_18" = mysql_stmt_sqlstate;
>+"mysql_stmt_store_result@libmysqlclient_18" = mysql_stmt_store_result;
>+"mysql_store_result@libmysqlclient_18" = mysql_store_result;
>+"mysql_thread_end@libmysqlclient_18" = mysql_thread_end;
>+"mysql_thread_id@libmysqlclient_18" = mysql_thread_id;
>+"mysql_thread_init@libmysqlclient_18" = mysql_thread_init;
>+"mysql_thread_safe@libmysqlclient_18" = mysql_thread_safe;
>+"mysql_use_result@libmysqlclient_18" = mysql_use_result;
>+"mysql_warning_count@libmysqlclient_18" = mysql_warning_count;
>+"free_defaults@libmysqlclient_18" = free_defaults;
>+"handle_options@libmysqlclient_18" = handle_options;
>+"load_defaults@libmysqlclient_18" = load_defaults;
>+"my_print_help@libmysqlclient_18" = my_print_help;
>+"my_make_scrambled_password@libmysqlclient_18" = my_make_scrambled_password;
>+"THR_KEY_mysys@libmysqlclient_18" = THR_KEY_mysys;
>+
>+VERSION {
> libmysqlclient_16 {
>   global:
> 	_fini;
>@@ -241,3 +358,4 @@ libmysqlclient_18_mariadb {
> 	dynamic_column_get;
> 	dynamic_column_prepare_decimal;
> };
>+}
>diff --git a/mariadb-versioning.patch b/mariadb-versioning.patch
>index 17757c8..cf9cc27 100644
>--- a/mariadb-versioning.patch
>+++ b/mariadb-versioning.patch
>@@ -265,7 +265,7 @@ diff -up mariadb-5.5.37/libmysql/CMakeLists.txt.p5bak mariadb-5.5.37/libmysql/CM
> +      ENDIF()
>        SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS 
> -        "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED} ${VERSION_SCRIPT_LINK_FLAGS}")
>-+        "${libmysql_link_flags} -Wl,--version-script=libmysql.version ${LINK_FLAG_NO_UNDEFINED}")
>++        "${libmysql_link_flags} -Wl,libmysql.version ${LINK_FLAG_NO_UNDEFINED}")
>      ENDIF() 
>      # clean direct output needs to be set several targets have the same name
>      #(mysqlclient in this case)

Actions: View | Diff

Attachments on bug 1111776: 912681