[gentoo-commits] proj/mysql-extras:master commit in: /

["Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>]

commit:     aea21e2809d9523b00a06093730fec41734bac9b
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 17 20:47:15 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Feb 17 20:47:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=aea21e28

Revert "Fix the missing #endif error by dropping the 07300_all_mysql_embedded_compilefix patch for the 5.0.92 release."

This reverts commit 9560b95a0d9e0b4c79296b8409cf7e1667a56883.

---
 00000_index.txt                                  |    5 +++++
 07300_all_mysql_embedded_compilefix-5.0.92.patch |   11 +++++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/00000_index.txt b/00000_index.txt
index ab861dd..94a582a 100644
--- a/00000_index.txt
+++ b/00000_index.txt
@@ -663,6 +663,11 @@
 @pn mysql
 @@ Compile fix for bug introduced by upstream in 5.0.91
 
+@patch 07300_all_mysql_embedded_compilefix-5.0.92.patch
+@ver 5.00.92.00 to 5.00.99.99
+@pn mysql
+@@ Compile fix for bug introduced by upstream in 5.0.91
+
 @patch 07310_all_mysql_gcc45-disable-abicheck.patch
 @ver 5.01.00.00 to 5.01.49.99
 @pn mysql

diff --git a/07300_all_mysql_embedded_compilefix-5.0.92.patch b/07300_all_mysql_embedded_compilefix-5.0.92.patch
new file mode 100644
index 0000000..26a4c87
--- /dev/null
+++ b/07300_all_mysql_embedded_compilefix-5.0.92.patch
@@ -0,0 +1,11 @@
+diff -Nuar mysql-5.0.91.orig//sql/sql_parse.cc mysql-5.0.91//sql/sql_parse.cc
+--- mysql-5.0.91.orig//sql/sql_parse.cc	2010-05-05 14:07:10.000000000 +0000
++++ mysql-5.0.91//sql/sql_parse.cc	2010-05-21 20:29:16.714903163 +0000
+@@ -499,6 +499,7 @@
+         big packets indefinitely, this is a previously established behavior
+         that needs to be preserved as to not break backwards compatibility.
+       */
++#if defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY)
+       thd->net.skip_big_packet= TRUE;
+ #endif
+       /* Ready to handle queries */