[mysql] Add my_print_help, load_defaults, free_defaults, and handle_options back to the ABI.

[Tom Lane]

commit d41be8a1c1993e8ff2ec38919c65fb1ddf7af894
Author: Tom Lane <tgl at redhat.com>
Date:   Mon Jan 3 14:21:39 2011 -0500

    Add my_print_help, load_defaults, free_defaults, and handle_options back to the ABI.

 libmysql.version |   18 ++++++++++++++----
 mysql.spec       |    8 +++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)
---
diff --git a/libmysql.version b/libmysql.version
index dcae997..83ac3c9 100644
--- a/libmysql.version
+++ b/libmysql.version
@@ -107,6 +107,12 @@ libmysqlclient_16 {
 	mysql_thread_safe;
 	mysql_use_result;
 	mysql_warning_count;
+# These are documented in Paul DuBois' MySQL book, so we treat them as part
+# of the de-facto API.
+	free_defaults;
+	handle_options;
+	load_defaults;
+	my_print_help;
   local:
 	*;
 };
@@ -119,13 +125,17 @@ libmysqlclient_16.1 {
 	mysql_load_plugin_v;
 	mysql_plugin_options;
 	mysql_stmt_next_result;
-# Ideally these wouldn't be exported, but mysql-connector-odbc requires them.
-# We limit the damage by prefixing mysql_ (see mysql-dubious-exports.patch),
-# which means the symbols are not present in libmysqlclient_16.
+#
+# Ideally the following symbols wouldn't be exported, but various applications
+# require them.  We limit the namespace damage by prefixing mysql_
+# (see mysql-dubious-exports.patch), which means the symbols are not present
+# in libmysqlclient_16.
+#
+# mysql-connector-odbc requires these
 	mysql_default_charset_info;
 	mysql_get_charset;
 	mysql_get_charset_by_csname;
 	mysql_net_realloc;
-# PHP's mysqli.so requires this (via the ER() macro).
+# PHP's mysqli.so requires this (via the ER() macro)
 	mysql_client_errors;
 };
diff --git a/mysql.spec b/mysql.spec
index c0f4c29..ac55f78 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.5.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -596,6 +596,12 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Mon Jan  3 2011 Tom Lane <tgl at redhat.com> 5.5.8-3
+- my_print_help, load_defaults, free_defaults, and handle_options all turn
+  out to be documented/recommended in Paul DuBois' MySQL book, so we'd better
+  consider them part of the de-facto API.
+Resolves: #666728
+
 * Mon Dec 27 2010 Tom Lane <tgl at redhat.com> 5.5.8-2
 - Add mysql_client_errors[] to the set of exported libmysqlclient symbols;
   needed by PHP.