WL#1051, more maintanable error messages.

BitKeeper/etc/logging_ok

@@ -10,6 +10,7 @@ acurtis@pcgem.rdg.cyberkinetica.com
 administrador@light.hegel.local
 ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
 akishkin@work.mysql.com
+anjuta@arthur.local
 antony@ltantony.dsl-verizon.net
 antony@ltantony.rdg.cyberkinetica.com
 antony@ltantony.rdg.cyberkinetica.homeunix.net

client/Makefile.am

@@ -18,7 +18,7 @@
 
 #AUTOMAKE_OPTIONS =              nostdinc
 INCLUDES =			-I$(top_srcdir)/include -I$(top_srcdir)/regex \
-				$(openssl_includes)
+				$(openssl_includes) -I$(top_srcdir)/extra
 LIBS =				@CLIENT_LIBS@
 DEPLIB=				../libmysql/libmysqlclient.la
 LDADD =				@CLIENT_EXTRA_LDFLAGS@ $(DEPLIB)

extra/Makefile.am

@@ -15,9 +15,19 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 INCLUDES =		@MT_INCLUDES@ -I$(top_srcdir)/include \
-			@ndbcluster_includes@ -I$(top_srcdir)/sql
+			@ndbcluster_includes@ -I$(top_srcdir)/sql \
+			-I$(top_srcdir)/extra
 LDADD =			@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
 			../dbug/libdbug.a ../strings/libmystrings.a
+BUILT_SOURCES=mysqld_error.h sql_state.h
+pkginclude_HEADERS=$(BUILT_SOURCES)
+
+mysqld_error.h: comp_err
+	$(top_builddir)/extra/comp_err --charset=$(srcdir)/../sql/share/charsets --out-dir=$(top_builddir)/sql/share/ --header_file=$(top_builddir)/extra/mysqld_error.h --state_file=$(top_builddir)/extra/sql_state.h --in_file=$(srcdir)/../sql/share/errmsg.txt
+
+sql_state.h: comp_err
+	$(top_builddir)/extra/comp_err --charset=$(srcdir)/../sql/share/charsets --out-dir=$(top_builddir)/sql/share/ --header_file=$(top_builddir)/extra/mysqld_error.h --state_file=$(top_builddir)/extra/sql_state.h --in_file=$(srcdir)/../sql/share/errmsg.txt
+
 bin_PROGRAMS =		replace comp_err perror resolveip my_print_defaults \
 			resolve_stack_dump mysql_waitpid
 noinst_PROGRAMS =	charset2html

include/Makefile.am

@@ -17,12 +17,12 @@
 
 BUILT_SOURCES =		mysql_version.h m_ctype.h my_config.h
 pkginclude_HEADERS =	my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \
-			mysql.h mysql_com.h mysqld_error.h mysql_embed.h \
+			mysql.h mysql_com.h mysql_embed.h \
 		  	my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
 			errmsg.h my_global.h my_net.h my_alloc.h \
 			my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
 			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
-			sql_state.h mysql_time.h $(BUILT_SOURCES)
+			mysql_time.h $(BUILT_SOURCES)
 noinst_HEADERS =	config-win.h config-os2.h config-netware.h \
 			nisam.h heap.h merge.h my_bitmap.h\
 			myisam.h myisampack.h myisammrg.h ft_global.h\

include/sql_state.h

-/* Copyright (C) 2000-2003 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/*
-  This file includes a mapping from mysql_errno.h to sql_state (as used by
-  MyODBC) and jdbc_state.
-  It's suitable to include into a C struct for further processing
-
-  The first column is the mysqld server error (declared in mysqld_error.h),
-  the second column is the ODBC state (which the 4.1 server sends out by
-  default) and the last is the state used by the JDBC driver.
-  If the last column is "" then it means that the JDBC driver is using the
-  ODBC state.
-
-  The errors in this file are sorted in the same order as in mysqld_error.h
-  to allow one to do binary searches for the sqlstate.
-*/
-
-ER_DUP_KEY,			"23000", "",
-ER_OUTOFMEMORY,			"HY001", "S1001",
-ER_OUT_OF_SORTMEMORY,		"HY001", "S1001",
-ER_CON_COUNT_ERROR,		"08004", "",
-ER_BAD_HOST_ERROR,		"08S01", "",
-ER_HANDSHAKE_ERROR,		"08S01", "",
-ER_DBACCESS_DENIED_ERROR,	"42000", "",
-ER_ACCESS_DENIED_ERROR,		"28000", "",
-ER_NO_DB_ERROR,			"3D000", "",
-ER_UNKNOWN_COM_ERROR,		"08S01", "",
-ER_BAD_NULL_ERROR,		"23000", "",
-ER_BAD_DB_ERROR,		"42000", "",
-ER_TABLE_EXISTS_ERROR,		"42S01", "",
-ER_BAD_TABLE_ERROR,		"42S02", "",
-ER_NON_UNIQ_ERROR,		"23000", "",
-ER_SERVER_SHUTDOWN,		"08S01", "",
-ER_BAD_FIELD_ERROR,		"42S22", "S0022",
-ER_WRONG_FIELD_WITH_GROUP,	"42000", "S1009",
-ER_WRONG_GROUP_FIELD,		"42000", "S1009",
-ER_WRONG_SUM_SELECT,		"42000", "S1009",
-ER_WRONG_VALUE_COUNT,		"21S01", "",
-ER_TOO_LONG_IDENT,		"42000", "S1009",
-ER_DUP_FIELDNAME,		"42S21", "S1009",
-ER_DUP_KEYNAME,			"42000", "S1009",
-ER_DUP_ENTRY,			"23000", "S1009",
-ER_WRONG_FIELD_SPEC,		"42000", "S1009",
-ER_PARSE_ERROR,			"42000", "",
-ER_EMPTY_QUERY,			"42000" , "",
-ER_NONUNIQ_TABLE,		"42000", "S1009",
-ER_INVALID_DEFAULT,		"42000", "S1009",
-ER_MULTIPLE_PRI_KEY,		"42000", "S1009",
-ER_TOO_MANY_KEYS,		"42000", "S1009",
-ER_TOO_MANY_KEY_PARTS,		"42000", "S1009",
-ER_TOO_LONG_KEY,		"42000", "S1009",
-ER_KEY_COLUMN_DOES_NOT_EXITS,	"42000", "S1009",
-ER_BLOB_USED_AS_KEY,		"42000", "S1009",
-ER_TOO_BIG_FIELDLENGTH,		"42000", "S1009",
-ER_WRONG_AUTO_KEY,		"42000", "S1009",
-ER_FORCING_CLOSE,		"08S01", "",
-ER_IPSOCK_ERROR,		"08S01", "",
-ER_NO_SUCH_INDEX,		"42S12", "S1009",
-ER_WRONG_FIELD_TERMINATORS,	"42000", "S1009",
-ER_BLOBS_AND_NO_TERMINATED,	"42000", "S1009",
-ER_CANT_REMOVE_ALL_FIELDS,	"42000", "",
-ER_CANT_DROP_FIELD_OR_KEY,	"42000", "",
-ER_BLOB_CANT_HAVE_DEFAULT,	"42000", "",
-ER_WRONG_DB_NAME,		"42000", "",
-ER_WRONG_TABLE_NAME,		"42000", "",
-ER_TOO_BIG_SELECT,		"42000", "",
-ER_UNKNOWN_PROCEDURE,		"42000", "",
-ER_WRONG_PARAMCOUNT_TO_PROCEDURE, "42000", "",
-ER_UNKNOWN_TABLE,		"42S02", "",
-ER_FIELD_SPECIFIED_TWICE,	"42000", "",
-ER_UNSUPPORTED_EXTENSION,	"42000", "",
-ER_TABLE_MUST_HAVE_COLUMNS,	"42000", "",
-ER_UNKNOWN_CHARACTER_SET,	"42000", "",
-ER_TOO_BIG_ROWSIZE,		"42000", "",
-ER_WRONG_OUTER_JOIN,		"42000", "",
-ER_NULL_COLUMN_IN_INDEX,	"42000", "",
-ER_PASSWORD_ANONYMOUS_USER,	"42000", "",
-ER_PASSWORD_NOT_ALLOWED,	"42000", "",
-ER_PASSWORD_NO_MATCH,		"42000", "",
-ER_WRONG_VALUE_COUNT_ON_ROW,	"21S01", "",
-ER_INVALID_USE_OF_NULL,		"22004", "",
-ER_REGEXP_ERROR,		"42000", "",
-ER_MIX_OF_GROUP_FUNC_AND_FIELDS,"42000", "",
-ER_NONEXISTING_GRANT,		"42000", "",
-ER_TABLEACCESS_DENIED_ERROR,	"42000", "",
-ER_COLUMNACCESS_DENIED_ERROR,	"42000", "",
-ER_ILLEGAL_GRANT_FOR_TABLE,	"42000", "",
-ER_GRANT_WRONG_HOST_OR_USER,	"42000", "",
-ER_NO_SUCH_TABLE,		"42S02", "",
-ER_NONEXISTING_TABLE_GRANT,	"42000", "",
-ER_NOT_ALLOWED_COMMAND,		"42000", "",
-ER_SYNTAX_ERROR,		"42000", "",
-ER_ABORTING_CONNECTION,		"08S01", "",
-ER_NET_PACKET_TOO_LARGE,	"08S01", "",
-ER_NET_READ_ERROR_FROM_PIPE,	"08S01", "",
-ER_NET_FCNTL_ERROR,		"08S01", "",
-ER_NET_PACKETS_OUT_OF_ORDER,	"08S01", "",
-ER_NET_UNCOMPRESS_ERROR,	"08S01", "",
-ER_NET_READ_ERROR,		"08S01", "",
-ER_NET_READ_INTERRUPTED,	"08S01", "",
-ER_NET_ERROR_ON_WRITE,		"08S01", "",
-ER_NET_WRITE_INTERRUPTED,	"08S01", "",
-ER_TOO_LONG_STRING,		"42000", "",
-ER_TABLE_CANT_HANDLE_BLOB,	"42000", "",
-ER_TABLE_CANT_HANDLE_AUTO_INCREMENT,	"42000", "",
-ER_WRONG_COLUMN_NAME,		"42000", "",
-ER_WRONG_KEY_COLUMN,		"42000", "",
-ER_DUP_UNIQUE,			"23000", "",
-ER_BLOB_KEY_WITHOUT_LENGTH,	"42000", "",
-ER_PRIMARY_CANT_HAVE_NULL,	"42000", "",
-ER_TOO_MANY_ROWS,		"42000", "",
-ER_REQUIRES_PRIMARY_KEY,	"42000", "",
-ER_CHECK_NO_SUCH_TABLE,		"42000", "",
-ER_CHECK_NOT_IMPLEMENTED,	"42000", "",
-ER_CANT_DO_THIS_DURING_AN_TRANSACTION,	"25000", "",
-ER_NEW_ABORTING_CONNECTION,	"08S01", "",
-ER_MASTER_NET_READ,		"08S01", "",
-ER_MASTER_NET_WRITE,		"08S01", "",
-ER_TOO_MANY_USER_CONNECTIONS,	"42000", "",
-ER_READ_ONLY_TRANSACTION,	"25000", "",
-ER_NO_PERMISSION_TO_CREATE_USER,"42000", "",
-ER_LOCK_DEADLOCK,		"40001", "",
-ER_NO_REFERENCED_ROW,		"23000", "",
-ER_ROW_IS_REFERENCED,		"23000", "",
-ER_CONNECT_TO_MASTER,		"08S01", "",
-ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT,"21000", "",
-ER_USER_LIMIT_REACHED,		"42000", "",
-ER_NO_DEFAULT,			"42000", "",
-ER_WRONG_VALUE_FOR_VAR,		"42000", "",
-ER_WRONG_TYPE_FOR_VAR,		"42000", "",
-ER_CANT_USE_OPTION_HERE,	"42000", "",
-ER_NOT_SUPPORTED_YET,		"42000", "",
-ER_WRONG_FK_DEF,		"42000", "",
-ER_OPERAND_COLUMNS,		"21000", "",
-ER_SUBQUERY_NO_1_ROW,		"21000", "",
-ER_ILLEGAL_REFERENCE,		"42S22", "",
-ER_DERIVED_MUST_HAVE_ALIAS,	"42000", "",
-ER_SELECT_REDUCED,		"01000", "",
-ER_TABLENAME_NOT_ALLOWED_HERE,	"42000", "",
-ER_NOT_SUPPORTED_AUTH_MODE,	"08004", "",
-ER_SPATIAL_CANT_HAVE_NULL,	"42000", "",
-ER_COLLATION_CHARSET_MISMATCH,	"42000", "",
-ER_WARN_TOO_FEW_RECORDS,	"01000", "",
-ER_WARN_TOO_MANY_RECORDS,	"01000", "",
-ER_WARN_NULL_TO_NOTNULL,	"22004", "",
-ER_WARN_DATA_OUT_OF_RANGE,	"22003", "",
-ER_WARN_DATA_TRUNCATED,		"01000", "",
-ER_WRONG_NAME_FOR_INDEX,        "42000", "",
-ER_WRONG_NAME_FOR_CATALOG,      "42000", "",
-ER_UNKNOWN_STORAGE_ENGINE,      "42000", "",
-ER_TRUNCATED_WRONG_VALUE,	"22007", "",
-/* 5.0 */
-ER_SP_NO_RECURSIVE_CREATE,	"2F003", "",
-ER_SP_ALREADY_EXISTS,		"42000", "",
-ER_SP_DOES_NOT_EXIST,		"42000", "",
-/*ER_SP_DROP_FAILED*/
-/*ER_SP_STORE_FAILED*/
-ER_SP_LILABEL_MISMATCH,		"42000", "",
-ER_SP_LABEL_REDEFINE,		"42000", "",
-ER_SP_LABEL_MISMATCH,		"42000", "",
-ER_SP_UNINIT_VAR,		"01000", "",
-ER_SP_BADSELECT,		"0A000", "",
-ER_SP_BADRETURN,		"42000", "",
-ER_SP_BADSTATEMENT,		"0A000", "",
-ER_UPDATE_LOG_DEPRECATED_IGNORED, "42000", "",
-ER_UPDATE_LOG_DEPRECATED_TRANSLATED, "42000", "",
-ER_QUERY_INTERRUPTED,		"70100", "",
-ER_SP_WRONG_NO_OF_ARGS,		"42000", "",
-ER_SP_COND_MISMATCH,		"42000", "",
-ER_SP_NORETURN,			"42000", "",
-ER_SP_NORETURNEND,		"2F005", "",
-ER_SP_BAD_CURSOR_QUERY,		"42000", "",
-ER_SP_BAD_CURSOR_SELECT,	"42000", "",
-ER_SP_CURSOR_MISMATCH,		"42000", "",
-ER_SP_CURSOR_ALREADY_OPEN,	"24000", "",
-ER_SP_CURSOR_NOT_OPEN,		"24000", "",
-ER_SP_UNDECLARED_VAR,		"42000", "",
-/*ER_SP_WRONG_NO_OF_FETCH_ARGS*/
-ER_SP_FETCH_NO_DATA,		"02000", "",
-ER_SP_DUP_PARAM,		"42000", "",
-ER_SP_DUP_VAR,			"42000", "",
-ER_SP_DUP_COND,			"42000", "",
-ER_SP_DUP_CURS,			"42000", "",
-/*ER_SP_CANT_ALTER*/
-ER_SP_SUBSELECT_NYI,            "0A000", "",
-ER_SP_NO_USE,                   "42000", "",
-ER_SP_VARCOND_AFTER_CURSHNDLR,  "42000", "",
-ER_SP_CURSOR_AFTER_HANDLER,     "42000", "",
-ER_SP_CASE_NOT_FOUND,           "20000", "",
-ER_DIVISION_BY_ZERO,		"22012", "",
-ER_ILLEGAL_VALUE_FOR_TYPE,	"22007", "",
-ER_SP_ACCESS_DENIED_ERROR,      "42000", "",

libmysql/Makefile.am

@@ -23,7 +23,8 @@
 target =	libmysqlclient.la
 target_defs =	-DUNDEF_THREADS_HACK -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
 LIBS =		@CLIENT_LIBS@
-INCLUDES =	-I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@
+INCLUDES =	-I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@ \
+		-I$(top_srcdir)/extra
 
 include $(srcdir)/Makefile.shared
 

libmysql_r/Makefile.am

@@ -25,8 +25,8 @@ target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
 LIBS = @LIBS@ @openssl_libs@
 
 INCLUDES = @MT_INCLUDES@ \
-	   -I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@
-
+	   -I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@ \
+		-I$(top_srcdir)/extra
 ## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
 include $(top_srcdir)/libmysql/Makefile.shared
 

server-tools/instance-manager/Makefile.am

@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES= -I$(top_srcdir)/include
+INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/extra
 
 DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER
 

sql/Makefile.am

@@ -22,7 +22,7 @@ MYSQLBASEdir=		$(prefix)
 INCLUDES =		@MT_INCLUDES@ @ZLIB_INCLUDES@ \
 			@bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \
 			-I$(top_srcdir)/include -I$(top_srcdir)/regex \
-			-I$(srcdir) $(openssl_includes)
+			-I$(srcdir) $(openssl_includes) -I$(top_srcdir)/extra
 WRAPLIBS=		@WRAPLIBS@
 SUBDIRS =		share
 libexec_PROGRAMS =	mysqld

sql/share/Makefile.am

@@ -9,10 +9,13 @@ dist-hook:
 	$(INSTALL_DATA) $(srcdir)/charsets/README $(distdir)/charsets
 	$(INSTALL_DATA) $(srcdir)/charsets/Index.xml $(distdir)/charsets
 
-all: @AVAILABLE_LANGUAGES_ERRORS@
+all:	english/errmsg.sys
 
-# this is ugly, but portable
-@AVAILABLE_LANGUAGES_ERRORS_RULES@
+# Use the english errmsg.sys as a flag that all errmsg.sys needs to be
+# created. Normally these are created by extra/Makefile.am
+
+english/errmsg.sys: errmsg.txt
+	$(top_builddir)/extra/comp_err --charset=$(srcdir)/charsets --out-dir=$(top_builddir)/sql/share/ --header_file=$(top_builddir)/extra/mysqld_error.h --state_file=$(top_builddir)/extra/sql_state.h --in_file=errmsg.txt
 
 install-data-local:
 	for lang in @AVAILABLE_LANGUAGES@; \
@@ -20,18 +23,12 @@ install-data-local:
 		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$lang; \
 		$(INSTALL_DATA) $(srcdir)/$$lang/errmsg.sys \
 			        $(DESTDIR)$(pkgdatadir)/$$lang/errmsg.sys; \
-		$(INSTALL_DATA) $(srcdir)/$$lang/errmsg.txt \
-			        $(DESTDIR)$(pkgdatadir)/$$lang/errmsg.txt; \
 	done
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/charsets
+		$(INSTALL_DATA) $(srcdir)/errmsg.txt \
+	        $(DESTDIR)$(pkgdatadir)/errmsg.txt; \
 	$(INSTALL_DATA) $(srcdir)/charsets/README $(DESTDIR)$(pkgdatadir)/charsets/README
 	$(INSTALL_DATA) $(srcdir)/charsets/*.xml $(DESTDIR)$(pkgdatadir)/charsets
 
-fix_errors:
-	for lang in @AVAILABLE_LANGUAGES@; \
-	do \
-	../../extra/comp_err -C$(srcdir)/charsets/ $(srcdir)/$$lang/errmsg.txt $(srcdir)/$$lang/errmsg.sys; \
-        done
-
 # Don't update the files from bitkeeper
 %::SCCS/s.%

tools/Makefile.am

@@ -15,7 +15,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 # Process this file with automake to create Makefile.in
 
-INCLUDES=@MT_INCLUDES@ -I$(top_srcdir)/include $(openssl_includes)
+INCLUDES=@MT_INCLUDES@ -I$(top_srcdir)/include $(openssl_includes) \
+	-I$(top_srcdir)/extra
 LDADD=  @CLIENT_EXTRA_LDFLAGS@ @openssl_libs@ \
 	$(top_builddir)/libmysql_r/libmysqlclient_r.la @ZLIB_LIBS@ 
 bin_PROGRAMS=		mysqlmanager