Skip to contentSkip to conversation

MySQL debug fix, and Mysql server on target

PATCH New Yann E. MORIN 1 participant 3 messages Feb 4, 2014

lore
Share & tools
lore
#0 lore raw

cover MySQL debug fix, and Mysql server on target

From: "Yann E. MORIN" <[email protected]>

Hello All!

Here is a consolidated series aboiut the MySQL changes.

Thanks to all involved in the initial patches! :-)

Regards,
Yann E. MORIN.

----------------------------------------------------------------
Marcelo Guti?rrez (1):
package/mysql: fix debugging options

Marcelo Guti?rrez(UTN/FRH) (1):
mysql: add option to build the server

 package/mysql/Config.in                            |  9 ++++
 .../mysql-0003-ac_stack_direction-is-unset.patch   | 15 ++++++
 .../mysql-0004-Fix-gen_lex_hash-execution.patch    | 32 ++++++++++++
 package/mysql/mysql.mk                             | 57 ++++++++++++++++++++--
 4 files changed, 110 insertions(+), 3 deletions(-)
 create mode 100644 package/mysql/mysql-0003-ac_stack_direction-is-unset.patch
 create mode 100644 package/mysql/mysql-0004-Fix-gen_lex_hash-execution.patch
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#1 lore raw

PATCH 1/2 mysql: add option to build the server

From: Marcelo Guti?rrez(UTN/FRH) <[email protected]>

[yann.morin.1998 at free.fr: fix menuconfig layout]
---
 package/mysql/Config.in                            |  9 +++++
 .../mysql-0003-ac_stack_direction-is-unset.patch   | 15 +++++++
 .../mysql-0004-Fix-gen_lex_hash-execution.patch    | 32 +++++++++++++++
 package/mysql/mysql.mk                             | 46 +++++++++++++++++++++-
 4 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 package/mysql/mysql-0003-ac_stack_direction-is-unset.patch
 create mode 100644 package/mysql/mysql-0004-Fix-gen_lex_hash-execution.patch
package/mysql/Config.in +9 -0
index 0def957..7133892 100644
@@ -10,6 +10,15 @@ config BR2_PACKAGE_MYSQL
 
 	  http://www.mysql.com/
 
+if BR2_PACKAGE_MYSQL
+
+config BR2_PACKAGE_MYSQL_SERVER
+	bool "MySQL server"
+	help
+	  Install the MySQL server on the target.
+
+endif
+
 comment "MySQL needs a toolchain w/ C++, threads"
 	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
package/mysql/mysql-0003-ac_stack_direction-is-unset.patch new file +15 -0
new file mode 100644
index 0000000..6fef0a9
@@ -0,0 +1,15 @@
+misc.m4: ac_cv_c_stack_direction is unset.
+
+Signed-off-by: Marcelo Gutierrez (UTN/FRH) <[email protected]>
+
+--- mysql-5.1.70.orig/config/ac-macros/misc.m4
++++ mysql-5.1.70/config/ac-macros/misc.m4
+@@ -477,7 +477,7 @@
+     exit(ptr_f(&a) < 0);
+   }
+   ], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
+-   ac_cv_c_stack_direction=)])
++   ac_cv_c_stack_direction=0)])
+  AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
+ ])dnl
+ 
package/mysql/mysql-0004-Fix-gen_lex_hash-execution.patch new file +32 -0
new file mode 100644
index 0000000..b91ed4f
@@ -0,0 +1,32 @@
+Makefile: fix cross-compiling the server
+
+MySQL Makefile believes it can run code it just compiled, to
+generate a header. This does not work for cross-compilation.
+
+Instead, use a pre-installed host-version of the required tool.
+
+Signed-off-by: Marcelo Gutierrez (UTN/FRH) <[email protected]>
+
+--- mysql-5.1.70/sql/Makefile.am
++++ mysql-5.1.70.patch/sql/Makefile.am
+@@ -177,7 +177,7 @@
+ # this avoid the rebuild of the built files in a source dist
+ lex_hash.h:	gen_lex_hash.cc lex.h
+ 		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
+-		./gen_lex_hash$(EXEEXT) > $@-t
++		gen_lex_hash$(EXEEXT) > $@-t
+ 		$(MV) $@-t $@
+ 
+ # For testing of udf_example.so
+
+--- mysql-5.1.70/sql/Makefile.in
++++ mysql-5.1.70.patch/sql/Makefile.in
+@@ -1310,7 +1310,7 @@
+ # this avoid the rebuild of the built files in a source dist
+ lex_hash.h:	gen_lex_hash.cc lex.h
+ 		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
+-		./gen_lex_hash$(EXEEXT) > $@-t
++		gen_lex_hash$(EXEEXT) > $@-t
+ 		$(MV) $@-t $@
+ 
+ # We might have some stuff not built in this build, but that we want to install
package/mysql/mysql.mk +45 -1

61 lines not on this page · raw message

Signature · 1 line
1.8.1.2
#2 lore raw

PATCH 2/2 package/mysql: fix debugging options

In reply to Yann E. MORIN

From: Marcelo Guti?rrez <[email protected]>

The usual --{en,dis}able-debug passed by the infrastructure are not recognised by mysql's ./configure, as it uses unusual options.

Also, debugging is only meaningfull to the server, not the client.

[yann.morin.1998 at free.fr: actually add the options, move in server if-block]
Cc Arnout Vandecappelle <[email protected]>
---
 package/mysql/mysql.mk | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
package/mysql/mysql.mk +9 -2
index 9bcbf4f..29a2abd 100644
@@ -30,8 +30,7 @@ MYSQL_CONF_OPT = \
 	--without-libedit \
 	--without-readline \
 	--with-low-memory \
-	--enable-thread-safe-client \
-	$(ENABLE_DEBUG)
+	--enable-thread-safe-client
 
 ifeq ($(BR2_PACKAGE_MYSQL_SERVER),y)
 MYSQL_DEPENDENCIES += host-mysql
@@ -57,6 +56,14 @@ MYSQL_CONF_OPT += \
 	--without-plugin-innodb_plugin \
 	--without-plugin-ndbcluster
 
+# Debugging is only available for the server, so no need for
+# this if-block outside of the server if-block
+ifeq ($(BR2_ENABLE_DEBUG),y)
+MYSQL_CONF_OPT += --with-debug=full
+else
+MYSQL_CONF_OPT += --without-debug
+endif
+
 define HOST_MYSQL_BUILD_CMDS
 	$(MAKE) -C $(@D)/include my_config.h
 	$(MAKE) -C $(@D)/mysys libmysys.a
Signature · 1 line
1.8.1.2