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/mysqld.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sql/mysqld.cc') diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 9c8e28e19f0..9b33c7efa51 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1696,9 +1696,9 @@ int main(int argc, char **argv) #ifdef EXTRA_DEBUG case 1: sql_print_error("\ -Warning: You should set server-id to a non-0 value if log-bin is enabled.\n\ -mysqld will log updates to the binary log, but will not accept connections\n\ -from slaves."); +Warning: You have enabled the binary log, but you haven't set server-id:\n\ +Updates will be logged to the binary log, but connections to slaves will\n\ +not be accepted."); break; #endif case 2: -- cgit v1.2.1