From bcbe99f9459f66d334762b5076c9ae1722569bcb Mon Sep 17 00:00:00 2001
From: Kent Boortz <kent.boortz@oracle.com>
Date: Wed, 20 Jun 2012 13:10:13 +0200
Subject: [PATCH 1/3] Version for this release build is 5.1.64

---
 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 4e7a3303353..84295a15f4a 100644
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ dnl
 dnl When changing the major version number please also check the switch
 dnl statement in mysqlbinlog::check_master_version().  You may also need
 dnl to update version.c in ndb.
-AC_INIT([MySQL Server], [5.1.65], [], [mysql])
+AC_INIT([MySQL Server], [5.1.64], [], [mysql])
 
 AC_CONFIG_SRCDIR([sql/mysqld.cc])
 AC_CANONICAL_SYSTEM

From c45bd024eb46116b89ceddf9818e143607e120ee Mon Sep 17 00:00:00 2001
From: Joerg Bruehe <joerg.bruehe@oracle.com>
Date: Thu, 21 Jun 2012 16:26:50 +0200
Subject: [PATCH 2/3] Fixing wrong comment syntax (discovered by Kent)

---
 sql/rpl_utility.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/rpl_utility.h b/sql/rpl_utility.h
index 81a10cca814..b2577643add 100644
--- a/sql/rpl_utility.h
+++ b/sql/rpl_utility.h
@@ -300,7 +300,7 @@ private:
 public:
   Deferred_log_events(Relay_log_info *rli);
   ~Deferred_log_events();
-  /* queue for exection at Query-log-event time prior the Query */;
+  /* queue for exection at Query-log-event time prior the Query */
   int add(Log_event *ev);
   bool is_empty();
   bool execute(Relay_log_info *rli);

From 3de8d224cf324815b5acef2417896f116b516c39 Mon Sep 17 00:00:00 2001
From: Kent Boortz <kent.boortz@oracle.com>
Date: Tue, 26 Jun 2012 16:30:15 +0200
Subject: [PATCH 3/3] Solve a linkage problem with "libmysqld" on several
 Solaris platforms: a multiple definition of 'THD::clear_error()' in (at
 least) libmysqld.a(lib_sql.o) and libmysqld.a(libfederated_a-ha_federated.o).

Patch provided by Ramil Kalimullin.
---
 libmysqld/lib_sql.cc | 6 ------
 sql/sql_class.h      | 3 +--
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 4afe02efbdb..18b8383406a 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -756,12 +756,6 @@ void THD::clear_data_list()
   cur_data= 0;
 }
 
-void THD::clear_error()
-{
-  if (main_da.is_error())
-    main_da.reset_diagnostics_area();
-}
-
 static char *dup_str_aux(MEM_ROOT *root, const char *from, uint length,
 			 CHARSET_INFO *fromcs, CHARSET_INFO *tocs)
 {
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 3ecf032db71..5cdb005b517 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -2089,7 +2089,6 @@ public:
   void add_changed_table(const char *key, long key_length);
   CHANGED_TABLE_LIST * changed_table_dup(const char *key, long key_length);
   int send_explain_fields(select_result *result);
-#ifndef EMBEDDED_LIBRARY
   /**
     Clear the current error, if any.
     We do not clear is_fatal_error or is_fatal_sub_stmt_error since we
@@ -2105,9 +2104,9 @@ public:
     is_slave_error= 0;
     DBUG_VOID_RETURN;
   }
+#ifndef EMBEDDED_LIBRARY
   inline bool vio_ok() const { return net.vio != 0; }
 #else
-  void clear_error();
   inline bool vio_ok() const { return true; }
 #endif
   /**