From 910052c18f7102eff6ac1bf4119144b875f4a7fc Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 14 Dec 2005 02:01:54 +0200 Subject: [PATCH 1/4] Datadir variable should not be reset, if it was set in this script. --- support-files/mysql.server.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 6dbffdc9778..1892e8b4a46 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -56,12 +56,18 @@ if test -z "$basedir" then basedir=@prefix@ bindir=@bindir@ - datadir=@localstatedir@ + if test -z "$datadir" + then + datadir=@localstatedir@ + fi sbindir=@sbindir@ libexecdir=@libexecdir@ else bindir="$basedir/bin" - datadir="$basedir/data" + if test -z "$datadir" + then + datadir="$basedir/data" + fi sbindir="$basedir/sbin" libexecdir="$basedir/libexec" fi From 81df509fe0d31f1f66d47aba5ec0b871fcf1c9b4 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 14 Dec 2005 02:08:48 +0200 Subject: [PATCH 2/4] Disabled archive db for Netware. --- sql/handler.cc | 6 +++--- sql/mysqld.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sql/handler.cc b/sql/handler.cc index 477a6f9bdae..47010de3002 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -60,7 +60,7 @@ handlerton example_hton = { "EXAMPLE", SHOW_OPTION_NO, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, HTON_NO_FLAGS }; #endif -#ifdef HAVE_ARCHIVE_DB +#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__) #include "ha_archive.h" extern handlerton archive_hton; #else @@ -314,7 +314,7 @@ handler *get_new_handler(TABLE *table, MEM_ROOT *alloc, enum db_type db_type) case DB_TYPE_EXAMPLE_DB: return new (alloc) ha_example(table); #endif -#ifdef HAVE_ARCHIVE_DB +#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__) case DB_TYPE_ARCHIVE_DB: return new (alloc) ha_archive(table); #endif @@ -513,7 +513,7 @@ int ha_panic(enum ha_panic_function flag) if (have_federated_db == SHOW_OPTION_YES) error|= federated_db_end(); #endif -#ifdef HAVE_ARCHIVE_DB +#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__) if (have_archive_db == SHOW_OPTION_YES) error|= archive_db_end(); #endif diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 8792d2560ae..cd0c2d736c2 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6323,7 +6323,7 @@ static void mysql_init_variables(void) #else have_example_db= SHOW_OPTION_NO; #endif -#ifdef HAVE_ARCHIVE_DB +#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__) have_archive_db= SHOW_OPTION_YES; #else have_archive_db= SHOW_OPTION_NO; From 06042b36f479170290e4a180251205ef10f13a7b Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 14 Dec 2005 02:56:34 +0200 Subject: [PATCH 3/4] Disabled test. Fails in ps-protocol mode. --- mysql-test/t/disabled.def | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 4f5e11e7fbd..4722fac435c 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -12,3 +12,4 @@ sp-goto : GOTO is currently is disabled - will be fixed in the future kill : Unstable test case, bug#9712 +subselect : Bug#15706 From 700e6cbd5ac5436039f4e7969bc97d5fb28cd11d Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 14 Dec 2005 03:08:59 +0200 Subject: [PATCH 4/4] Patch for Bug#13640 --- extra/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/Makefile.am b/extra/Makefile.am index a60656cb5c6..c0ad75059df 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -29,8 +29,8 @@ SUBDIRS= DIST_SUBDIRS= yassl # This will build mysqld_error.h and sql_state.h -$(top_builddir)/include/mysqld_error.h: comp_err - $(top_builddir)/extra/comp_err \ +$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT) + $(top_builddir)/extra/comp_err$(EXEEXT) \ --charset=$(top_srcdir)/sql/share/charsets \ --out-dir=$(top_builddir)/sql/share/ \ --header_file=$(top_builddir)/include/mysqld_error.h \