From 4bf00b00b74e11b801d6ad4ade5de9a07b88e1cf Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 26 Mar 2001 13:27:36 +0300 Subject: Added test case that crashed Innobase BUILD/compile-solaris-sparc-purify: Changed to old (easy-to-edit) format extra/resolve_stack_dump.c: Don't require -s and -n options innobase/include/Makefile.i: Applied Heikki's changes innobase/include/univ.i: Applied Heikki's changes innobase/os/os0file.c: Fix problem with Signal 14 on Solaris mysys/mf_qsort.c: Fix for purify sql-bench/Results/ATIS-mysql-Linux_2.2.16_SMP_alpha: New test results sql-bench/Results/RUN-mysql-Linux_2.2.16_SMP_alpha: New test results sql-bench/Results/alter-table-mysql-Linux_2.2.16_SMP_alpha: New test results sql-bench/Results/big-tables-mysql-Linux_2.2.16_SMP_alpha: New test results sql-bench/Results/connect-mysql-Linux_2.2.16_SMP_alpha: New test results sql-bench/Results/create-mysql-Linux_2.2.16_SMP_alpha: New test results sql-bench/Results/insert-mysql-Linux_2.2.16_SMP_alpha: New test results sql-bench/Results/select-mysql-Linux_2.2.16_SMP_alpha: New test results sql-bench/Results/wisconsin-mysql-Linux_2.2.16_SMP_alpha: New test results sql/ha_gemini.h: Fixed that SHOW VARIABLES shows table type as disabled if it can't be initialized. sql/ha_innobase.cc: Merged Heikkis changes sql/ha_innobase.h: Fixed that SHOW VARIABLES shows table type as disabled if it can't be initialized. sql/handler.cc: Fixed that SHOW VARIABLES shows table type as disabled if it can't be initialized. sql/mysqld.cc: Cleaned up error warning message. --- sql/handler.cc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'sql/handler.cc') diff --git a/sql/handler.cc b/sql/handler.cc index 1d41b33e90b..600683d9c18 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -159,7 +159,10 @@ int ha_init() if (innobase_init()) return -1; if (!innobase_skip) // If we couldn't use handler + { opt_using_transactions=1; + have_innobase=SHOW_OPTION_DISABLED; + } } #endif #ifdef HAVE_GEMINI_DB @@ -168,7 +171,10 @@ int ha_init() if (gemini_init()) return -1; if (!gemini_skip) // If we couldn't use handler + { opt_using_transactions=1; + have_gemini=SHOW_OPTION_DISABLED; + } } #endif return 0; -- cgit v1.2.1