From 80deee256c15b13062da8c0eae054aefc043d7d0 Mon Sep 17 00:00:00 2001
From: "lenz@kallisto.local" <>
Date: Tue, 2 Dec 2003 15:56:18 +0100
Subject: [PATCH 01/12]  - removed INSTALL-WIN-SOURCE from the BK tree as its
 content has been    added to manual.texi - extract it from there instead.

---
 Docs/Makefile.am   |   5 +-
 INSTALL-WIN-SOURCE | 221 ---------------------------------------------
 2 files changed, 4 insertions(+), 222 deletions(-)
 delete mode 100644 INSTALL-WIN-SOURCE

diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index 606279f967e..19b2efd4cab 100644
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -26,7 +26,7 @@ EXTRA_DIST =		$(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt \
 
 all:			$(targets) txt_files
 
-txt_files:		../INSTALL-SOURCE ../COPYING \
+txt_files:		../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE \
 			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
 
 CLEAN_FILES:		$(BUILD_SOURCES)
@@ -194,6 +194,9 @@ GT = $(srcdir)/Support/generate-text-files.pl
 ../INSTALL-SOURCE:	mysql.info $(GT)
 	perl -w $(GT) mysql.info "Installing" "Tutorial" > $@
 
+../INSTALL-WIN-SOURCE:	mysql.info $(GT)
+	perl -w $(GT) mysql.info "Windows source build" "Post-installation" > $@
+
 # We put the description for the binary installation here so that
 # people who download source wont have to see it. It is moved up to
 # the toplevel by the script that makes the binary tar files.
diff --git a/INSTALL-WIN-SOURCE b/INSTALL-WIN-SOURCE
deleted file mode 100644
index 969eb91f5b1..00000000000
--- a/INSTALL-WIN-SOURCE
+++ /dev/null
@@ -1,221 +0,0 @@
-#########################################################
-#                                                       #
-#         HOWTO : INSTALL MySQL FROM SOURCE             #
-#                    WINDOWS PORT                       #
-#                                                       #  
-#           Copyright (C) MySQL AB 1995-2003            #
-#########################################################
-
-This is a simple 'HOWTO' document describing how to
-build MySQL binaries for versions 4.1 and above on
-Windows. Instructions are provided for building binaries
-from a standard source distribution or from the BitKeeper
-tree that contains the latest development source.
-
----------------------------------------------------------
-NOTE
----------------------------------------------------------
-
-Normally, it is best to use precompiled binary distributions
-of MySQL that are built specifically for optimal performance
-on Windows by MySQL AB.  Binary distributions are available
-from:
-
-http://www.mysql.com/downloads/
-
-The instructions in this document are strictly for users
-who want to test MySQL on Windows from the latest source or
-from the BitKeeper tree, and for internal MySQL developers.
-
---------------------------------------------------------
-TABLE OF CONTENTS
---------------------------------------------------------
-1. REQUIREMENTS
-2. OBTAINING A WINDOWS SOURCE DISTRIBUTION
-3. CREATING A SOURCE PACKAGE FROM THE 'BitKeeper' TREE
-4. BUILDING 'mysql server and clients' FROM VC++ WORKSPACE
-5. BUILDING FROM 'nmake' MAKEFILES
-6. STARTING THE MYSQL SERVER FOR THE FIRST TIME
-7. TESTING THE CONNECTION
-8. SPECIAL NOTES AND CONSIDERATIONS
-
--------------------------------------------------------
-1. REQUIREMENTS
--------------------------------------------------------
-
-To build MySQL on Windows from source, you need the
-following compiler and resources available on your Windows
-system:
-
-   - Microsoft Visual C++ 6.0 and above
-   - ~45 MB disk space
-   - 64 MB RAM
-
-You'll also need a MySQL source distribution, which you
-can obtain as described in section 2.
-
--------------------------------------------------------
-2. OBTAINING A WINDOWS SOURCE DISTRIBUTION
--------------------------------------------------------
-
-There are two ways you can get a Windows source distribution
-for MySQL version 4.1 and above:
-
- I.  Obtain a MySQL AB-distributed source distribution for the
-     particular version of MySQL in which you are interested.
-     Prepackaged source distributions are available for released
-     versions of MySQL and can be obtained from:
-     
-     http://www.mysql.com/downloads/
-
- II. Alternatively, you can package a source distribution
-     yourself from the latest BitKeeper developer source
-     tree. If you plan to do this, you must create the
-     package on a Unix system and then transfer it to your
-     Windows system.  (The reason for this is that some of the
-     configuration and build steps require tools that work only
-     on Unix.)  The BitKeeper approach thus requires:
-
-     - A system running Unix, or a Unix-like system such as Linux
-     - BitKeeper 3.0 installed on that system (you can obtain
-       BitKeeper from http://www.bitkeeper.com)
-
-If you are using the first option, you can skip the  next
-section and go directly to "BUILDING 'mysql server & clients'
-FROM VC++ WORKSPACE"
-
--------------------------------------------------------
-3. CREATING A SOURCE PACKAGE FROM THE 'BitKeeper' TREE
--------------------------------------------------------
-
-To build the latest Windows source package from the current
-BitKeeper source tree, use the following instructions. Please
-note that this procedure must be performed on a system
-running a Unix or Unix-like operating system.  (The procedure
-is known to work well on Linux, for example.)
-
-- Clone the BitKeeper source tree for MySQL (version 4.1
-  or above, as desired).  For more information how to clone
-  the source tree, see the instructions at:
-
-  http://www.mysql.com/doc/en/Installing_source_tree.html
-
-- Configure and build the distribution so that you have a
-  server binary to work with.  One way to do this is to run
-  the following command in the top-level directory of your
-  source tree:
-
-  ./BUILD/compile-pentium-max
-
-- After making sure that the build process completed successfully,
-  run the following utility script from top-level directory
-  of your source tree:
-
-  ./scripts/make_win_src_distribution
-
-  This script creates a Windows source package, to be used on
-  your Windows system.  You can supply different options to the
-  script based on your needs. It accepts the following options:
-
-    --debug   Debug, without creating the package
-    --tmp     Specify the temporary location
-    --suffix  Suffix name for the package
-    --dirname Directory name to copy files (intermediate)
-    --silent  Do not list verbosely files processed
-    --tar     Create tar.gz package instead of .zip
-    --help    Show this help message
-
-   By default, make_win_src_distribution creates a zipped
-   archive with the name mysql-$version-win-src.zip, where
-   $version represents the version of your MySQL source tree.
- 
- - Copy or upload to your Windows machine the Windows source
-   package that you have just created. To compile it, use
-   the instructions in the next section.
-
----------------------------------------------------------
-4. BUILDING 'mysql server & clients' FROM VC++ WORKSPACE
----------------------------------------------------------
-
-NOTE: MySQL 4.1 and above VC++ workspace files are compatible
-      with Microsoft Visual Studio 6.0 and above(7.0/.NET)
-      editions and tested by MySQL folks before each 
-      release.
-
-Unpack the Windows source zipped archive to a folder and open 
-mysql.dsw from your top-level directory.
-
-If you want to build both release and debug versions, then
-select 'build' -> 'buildall' option. To build only release
-or debug versions, select all appropriate workspaces from
-the 'build' -> 'batch build' option.
-
-The simplest solution to building the basic clients and core
-server is to set your current active workspace as 'mysqld'
-release or debug version, and just hit 'build' or 'F7', which
-creates the necessary client binaries in the 'client_release'
-or 'client_debug' directories. The libraries are placed in the
-'lib_release' and 'lib_debug' directories for release and
-debug versions, respectively.
-
-Now you have built the distribution. If you get any compiler
-errors, please cross check and email the compiler output to 
-win32@lists.mysql.com for further assistance.
-
----------------------------------------------------------
-5. BUILDING FROM 'nmake' MAKEFILES
----------------------------------------------------------
-TODO from MySQL PIEFU team.
-
----------------------------------------------------------
-6. STARTING THE MYSQL SERVER FOR THE FIRST TIME
----------------------------------------------------------
-
-The server built using the preceding instructions will
-expect that the MySQL base directory and data directory
-are C:\mysql and C:\mysql\data by default. If you want to
-test your server using the source root directory and its
-data directory as the base directory and data directory,
-you will need to tell the server their pathnames. You can
-either do this on the command line with the --basedir
-and --data-dir options, or place appropriate options in
-an option file (C:\my.cnf or the my.ini file in your
-Windows directory). If you have an existing data directory
-elsewhere that you want to use, you can specify its pathname
-instead.
-
-Start your server from the 'client_release' or 'client_debug'
-directory (depending on which server you want to use). The
-general instructions are given here:
-
-http://www.mysql.com/doc/en/Windows_installation.html
-
-You'll have to adapt the instructions appropriately if you
-want to use a different base directory and/or data directory.
-
-That's all!!! See, it's as simple to build MySQL on Windows
-as on any other platform!!!
-
----------------------------------------------------------
-7. TESTING THE CONNECTION
----------------------------------------------------------
-
-Once the server is running in standalone fashion or as a
-service based on your configuration, try to connect to it
-from the 'mysql' command line SQL interactive utility that
-exists in your 'client_release' or 'client_debug' directory.
-
----------------------------------------------------------
-8. SPECIAL NOTES AND CONSIDERATIONS
----------------------------------------------------------
-
-- For production use, MySQL AB does not advise using a MySQL
-  server built by yourself from source. It is preferable to
-  stick to using binaries shipped by MySQL AB.
-
-- If you find something not working as expected, or you have
-  suggestions about ways to improve the current build process
-  on Windows, please email to win32@lists.mysql.com.
-
-Thanks
-MySQL Team

From afc619f0a2e4351bd39acac53ec2fbc6be266a28 Mon Sep 17 00:00:00 2001
From: "antony@ltantony.rdg.cyberkinetica.homeunix.net" <>
Date: Tue, 2 Dec 2003 20:23:13 +0000
Subject: [PATCH 02/12] WorkLog#1280 - Remove fixed table handler from lex/yacc

---
 BitKeeper/etc/logging_ok              |  1 +
 include/mysqld_error.h                |  3 +-
 include/sql_state.h                   |  1 +
 mysql-test/r/create.result            | 14 +++--
 mysql-test/r/rpl_change_master.result |  4 +-
 mysql-test/r/variables.result         |  4 +-
 mysql-test/r/warnings.result          |  4 +-
 mysql-test/t/create.test              |  4 +-
 mysql-test/t/variables.test           |  2 +-
 sql/handler.cc                        | 75 +++++++++++++++++++++++----
 sql/handler.h                         | 12 ++++-
 sql/lex.h                             |  6 ---
 sql/mysql_priv.h                      |  1 -
 sql/mysqld.cc                         |  5 +-
 sql/set_var.cc                        | 59 ++++++++++++++++++++-
 sql/set_var.h                         | 20 +++++++
 sql/share/czech/errmsg.txt            |  1 +
 sql/share/danish/errmsg.txt           |  1 +
 sql/share/dutch/errmsg.txt            |  1 +
 sql/share/english/errmsg.txt          |  1 +
 sql/share/estonian/errmsg.txt         |  1 +
 sql/share/french/errmsg.txt           |  1 +
 sql/share/german/errmsg.txt           |  1 +
 sql/share/greek/errmsg.txt            |  1 +
 sql/share/hungarian/errmsg.txt        |  1 +
 sql/share/italian/errmsg.txt          |  1 +
 sql/share/japanese/errmsg.txt         |  1 +
 sql/share/korean/errmsg.txt           |  1 +
 sql/share/norwegian-ny/errmsg.txt     |  1 +
 sql/share/norwegian/errmsg.txt        |  1 +
 sql/share/polish/errmsg.txt           |  1 +
 sql/share/portuguese/errmsg.txt       |  1 +
 sql/share/romanian/errmsg.txt         |  1 +
 sql/share/russian/errmsg.txt          |  1 +
 sql/share/serbian/errmsg.txt          |  1 +
 sql/share/slovak/errmsg.txt           |  1 +
 sql/share/spanish/errmsg.txt          |  1 +
 sql/share/swedish/errmsg.txt          |  1 +
 sql/share/ukrainian/errmsg.txt        |  1 +
 sql/sql_show.cc                       | 31 +----------
 sql/sql_table.cc                      |  4 +-
 sql/sql_yacc.yy                       | 25 +++------
 42 files changed, 209 insertions(+), 89 deletions(-)

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 9fecdc743db..57b624db888 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -8,6 +8,7 @@ WAX@sergbook.mysql.com
 administrador@light.hegel.local
 ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
 akishkin@work.mysql.com
+antony@ltantony.rdg.cyberkinetica.homeunix.net
 arjen@co3064164-a.bitbike.com
 arjen@fred.bitbike.com
 arjen@george.bitbike.com
diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index a6e23fbff3a..bb5d3ae42f4 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -300,4 +300,5 @@
 #define ER_WARN_QC_RESIZE 1281
 #define ER_BAD_FT_COLUMN 1282
 #define ER_UNKNOWN_KEY_CACHE 1283
-#define ER_ERROR_MESSAGES 284
+#define ER_UNKNOWN_TABLE_ENGINE 1284
+#define ER_ERROR_MESSAGES 285
diff --git a/include/sql_state.h b/include/sql_state.h
index a514b1e59fc..ad62ddeb670 100644
--- a/include/sql_state.h
+++ b/include/sql_state.h
@@ -161,3 +161,4 @@ ER_WARN_DATA_OUT_OF_RANGE,	"01000", "",
 ER_WARN_DATA_TRUNCATED,		"01000", "",
 ER_WRONG_NAME_FOR_INDEX,        "42000", "",
 ER_WRONG_NAME_FOR_CATALOG,      "42000", "",
+ER_UNKNOWN_TABLE_ENGINE,        "42000", "",
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 28f06f0bf47..e71eff44df8 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -200,17 +200,16 @@ t1	CREATE TABLE `t1` (
 ) TYPE=HEAP DEFAULT CHARSET=latin1
 drop table t1;
 SET SESSION table_type="gemini";
+ERROR 42000: Unknown table engine 'gemini'
 SELECT @@table_type;
 @@table_type
-GEMINI
+HEAP
 CREATE TABLE t1 (a int not null);
-Warnings:
-Warning	1265	Using storage engine MYISAM for table 't1'
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL default '0'
-) TYPE=MyISAM DEFAULT CHARSET=latin1
+) TYPE=HEAP DEFAULT CHARSET=latin1
 SET SESSION table_type=default;
 drop table t1;
 create table t1 ( k1 varchar(2), k2 int, primary key(k1,k2));
@@ -349,17 +348,16 @@ t1	CREATE TABLE `t1` (
 ) TYPE=HEAP DEFAULT CHARSET=latin1
 drop table t1;
 SET SESSION table_type="gemini";
+ERROR 42000: Unknown table engine 'gemini'
 SELECT @@table_type;
 @@table_type
-GEMINI
+HEAP
 CREATE TABLE t1 (a int not null);
-Warnings:
-Warning	1265	Using storage engine MYISAM for table 't1'
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL default '0'
-) TYPE=MyISAM DEFAULT CHARSET=latin1
+) TYPE=HEAP DEFAULT CHARSET=latin1
 SET SESSION table_type=default;
 drop table t1;
 create table t1(a int,b int,c int unsigned,d date,e char,f datetime,g time,h blob);
diff --git a/mysql-test/r/rpl_change_master.result b/mysql-test/r/rpl_change_master.result
index 883cb65171c..a886ad9c304 100644
--- a/mysql-test/r/rpl_change_master.result
+++ b/mysql-test/r/rpl_change_master.result
@@ -15,11 +15,11 @@ select * from t1;
 n
 1
 show slave status;
-Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_do_db	Replicate_ignore_db	Replicate_do_table	Replicate_ignore_table	Replicate_wild_do_table	Replicate_wild_ignore_table	Last_errno	Last_error	Skip_counter	Exec_master_log_pos	Relay_log_space	Until_condition	Until_Log_File	Until_Log_pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_behind_master
+Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
 #	127.0.0.1	root	9306	1	master-bin.000001	273	slave-relay-bin.000002	258	master-bin.000001	No	No							0		0	214	317	None		0	No						#
 change master to master_user='root';
 show slave status;
-Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_do_db	Replicate_ignore_db	Replicate_do_table	Replicate_ignore_table	Replicate_wild_do_table	Replicate_wild_ignore_table	Last_errno	Last_error	Skip_counter	Exec_master_log_pos	Relay_log_space	Until_condition	Until_Log_File	Until_Log_pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_behind_master
+Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
 #	127.0.0.1	root	9306	1	master-bin.000001	214	slave-relay-bin.000001	4	master-bin.000001	No	No							0		0	214	4	None		0	No						#
 select release_lock("a");
 release_lock("a")
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 90654bece2e..8face0ce2b7 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -121,7 +121,7 @@ Variable_name	Value
 table_type	HEAP
 show global variables like 'table_type';
 Variable_name	Value
-table_type	INNODB
+table_type	InnoDB
 set GLOBAL query_cache_size=100000;
 set GLOBAL myisam_max_sort_file_size=2000000;
 show global variables like 'myisam_max_sort_file_size';
@@ -219,7 +219,7 @@ ERROR HY000: Unknown system variable 'unknown_variable'
 set max_join_size="hello";
 ERROR 42000: Wrong argument type to variable 'max_join_size'
 set table_type=UNKNOWN_TABLE_TYPE;
-ERROR 42000: Variable 'table_type' can't be set to the value of 'UNKNOWN_TABLE_TYPE'
+ERROR 42000: Unknown table engine 'UNKNOWN_TABLE_TYPE'
 set table_type=INNODB, big_tables=2;
 ERROR 42000: Variable 'big_tables' can't be set to the value of '2'
 show local variables like 'table_type';
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result
index 26353785733..1942f1a25bb 100644
--- a/mysql-test/r/warnings.result
+++ b/mysql-test/r/warnings.result
@@ -121,8 +121,8 @@ select @@warning_count;
 drop table t1;
 create table t1 (id int) type=isam;
 Warnings:
-Warning	1265	Using storage engine MYISAM for table 't1'
+Warning	1265	Using storage engine MyISAM for table 't1'
 alter table t1 type=isam;
 Warnings:
-Warning	1265	Using storage engine MYISAM for table 't1'
+Warning	1265	Using storage engine MyISAM for table 't1'
 drop table t1;
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index 0c1280751bc..d09dd8a8362 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -155,7 +155,7 @@ SELECT @@table_type;
 CREATE TABLE t1 (a int not null);
 show create table t1;
 drop table t1;
-# Test what happens when using a non existing table type
+--error 1284
 SET SESSION table_type="gemini";
 SELECT @@table_type;
 CREATE TABLE t1 (a int not null);
@@ -276,7 +276,7 @@ SELECT @@table_type;
 CREATE TABLE t1 (a int not null);
 show create table t1;
 drop table t1;
-# Test what happens when using a non existing table type
+--error 1284
 SET SESSION table_type="gemini";
 SELECT @@table_type;
 CREATE TABLE t1 (a int not null);
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index 6365ad77c57..241e0c73931 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -124,7 +124,7 @@ set big_tables="OFFF";
 set unknown_variable=1;
 --error 1232
 set max_join_size="hello";
---error 1231
+--error 1284
 set table_type=UNKNOWN_TABLE_TYPE;
 --error 1231
 set table_type=INNODB, big_tables=2;
diff --git a/sql/handler.cc b/sql/handler.cc
index 5267ddc8986..fe168d12fce 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -50,14 +50,33 @@ ulong ha_read_count, ha_write_count, ha_delete_count, ha_update_count,
       ha_commit_count, ha_rollback_count,
       ha_read_rnd_count, ha_read_rnd_next_count;
 
-const char *ha_table_type[] = {
-  "", "DIAB_ISAM","HASH","MISAM","PISAM","RMS_ISAM","HEAP", "ISAM",
-  "MRG_ISAM","MYISAM", "MRG_MYISAM", "BDB", "INNODB", "GEMINI", "?", "?",NullS
-};
+static SHOW_COMP_OPTION have_yes= SHOW_OPTION_YES;
 
-TYPELIB ha_table_typelib=
+struct show_table_type_st sys_table_types[]=
 {
-  array_elements(ha_table_type)-3, "", ha_table_type
+  {"MyISAM",	&have_yes,
+   "Default type from 3.23 with great performance", DB_TYPE_MYISAM},
+  {"HEAP",	&have_yes,
+   "Hash based, stored in memory, useful for temporary tables", DB_TYPE_HEAP},
+  {"MEMORY",	&have_yes,
+   "Alias for HEAP", DB_TYPE_HEAP},
+  {"MERGE",	&have_yes,
+   "Collection of identical MyISAM tables", DB_TYPE_MRG_MYISAM},
+  {"MRG_MYISAM",&have_yes,
+   "Alias for MERGE", DB_TYPE_MRG_MYISAM},
+  {"ISAM",	&have_isam,
+   "Obsolete table type; Is replaced by MyISAM", DB_TYPE_ISAM},
+  {"MRG_ISAM",  &have_isam,
+   "Obsolete table type; Is replaced by MRG_MYISAM", DB_TYPE_MRG_ISAM},
+  {"InnoDB",	&have_innodb,
+   "Supports transactions, row-level locking and foreign keys", DB_TYPE_INNODB},
+  {"INNOBASE",	&have_innodb,
+   "Alias for INNODB", DB_TYPE_INNODB},
+  {"BDB",	&have_berkeley_db,
+   "Supports transactions and page-level locking", DB_TYPE_BERKELEY_DB},
+  {"BERKELEYDB",&have_berkeley_db,
+   "Alias for BDB", DB_TYPE_BERKELEY_DB},
+  {NullS, NULL, NullS, DB_TYPE_UNKNOWN}
 };
 
 const char *ha_row_type[] = {
@@ -70,6 +89,33 @@ const char *tx_isolation_names[] =
 TYPELIB tx_isolation_typelib= {array_elements(tx_isolation_names)-1,"",
 			       tx_isolation_names};
 
+enum db_type ha_resolve_by_name(const char *name, uint namelen)
+{
+  if (!my_strcasecmp(&my_charset_latin1, name, "DEFAULT")) {
+    return(enum db_type) current_thd->variables.table_type;
+  }
+  
+  show_table_type_st *types;
+  for (types= sys_table_types; types->type; types++)
+  {
+    if (!my_strcasecmp(&my_charset_latin1, name, types->type))
+      return(enum db_type)types->db_type;
+  }
+  return DB_TYPE_UNKNOWN;
+}
+
+const char *ha_get_table_type(enum db_type db_type)
+{
+  show_table_type_st *types;
+  for (types= sys_table_types; types->type; types++)
+  {
+    if (db_type == types->db_type)
+      return types->type;
+  }
+  
+  return "none";
+}
+
 	/* Use other database handler if databasehandler is not incompiled */
 
 enum db_type ha_checktype(enum db_type database_type)
@@ -77,18 +123,21 @@ enum db_type ha_checktype(enum db_type database_type)
   switch (database_type) {
 #ifdef HAVE_BERKELEY_DB
   case DB_TYPE_BERKELEY_DB:
-    return(berkeley_skip ? DB_TYPE_MYISAM : database_type);
+    if (berkeley_skip) break;
+    return (database_type);
 #endif
 #ifdef HAVE_INNOBASE_DB
   case DB_TYPE_INNODB:
-    return(innodb_skip ? DB_TYPE_MYISAM : database_type);
+    if (innodb_skip) break;
+    return (database_type);
 #endif
 #ifndef NO_HASH
   case DB_TYPE_HASH:
 #endif
 #ifdef HAVE_ISAM
   case DB_TYPE_ISAM:
-    return (isam_skip ? DB_TYPE_MYISAM : database_type);
+    if (isam_skip) break;
+    return (database_type);
   case DB_TYPE_MRG_ISAM:
     return (isam_skip ? DB_TYPE_MRG_MYISAM : database_type);
 #else
@@ -102,7 +151,13 @@ enum db_type ha_checktype(enum db_type database_type)
   default:
     break;
   }
-  return(DB_TYPE_MYISAM);			/* Use this as default */
+  
+  return 
+    DB_TYPE_UNKNOWN != (enum db_type) current_thd->variables.table_type ?
+    (enum db_type) current_thd->variables.table_type :
+    DB_TYPE_UNKNOWN != (enum db_type) global_system_variables.table_type ?
+    (enum db_type) global_system_variables.table_type :
+    DB_TYPE_MYISAM;
 } /* ha_checktype */
 
 
diff --git a/sql/handler.h b/sql/handler.h
index 9089db60d77..2183b8fa992 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -131,6 +131,13 @@ enum db_type { DB_TYPE_UNKNOWN=0,DB_TYPE_DIAB_ISAM=1,
 	       DB_TYPE_BERKELEY_DB, DB_TYPE_INNODB, DB_TYPE_GEMINI,
 	       DB_TYPE_DEFAULT };
 
+struct show_table_type_st {
+  const char *type;
+  SHOW_COMP_OPTION *value;
+  const char *comment;
+  enum db_type db_type;
+};
+
 enum row_type { ROW_TYPE_NOT_USED=-1, ROW_TYPE_DEFAULT, ROW_TYPE_FIXED,
 		ROW_TYPE_DYNAMIC, ROW_TYPE_COMPRESSED};
 
@@ -372,8 +379,9 @@ public:
 
 	/* Some extern variables used with handlers */
 
+extern struct show_table_type_st sys_table_types[];
 extern const char *ha_row_type[];
-extern TYPELIB ha_table_typelib, tx_isolation_typelib;
+extern TYPELIB tx_isolation_typelib;
 
 	/* Wrapper functions */
 #define ha_commit_stmt(thd) (ha_commit_trans((thd), &((thd)->transaction.stmt)))
@@ -383,6 +391,8 @@ extern TYPELIB ha_table_typelib, tx_isolation_typelib;
 
 #define ha_supports_generate(T) (T != DB_TYPE_INNODB)
 
+enum db_type ha_resolve_by_name(const char *name, uint namelen);
+const char *ha_get_table_type(enum db_type db_type);
 handler *get_new_handler(TABLE *table, enum db_type db_type);
 my_off_t ha_get_ptr(byte *ptr, uint pack_length);
 void ha_store_ptr(byte *buff, uint pack_length, my_off_t pos);
diff --git a/sql/lex.h b/sql/lex.h
index fd13af348d1..9dd3ede7f44 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -186,7 +186,6 @@ static SYMBOL symbols[] = {
   { "HAVING",		SYM(HAVING),0,0},
   { "HANDLER",		SYM(HANDLER_SYM),0,0},
   { "HASH",		SYM(HASH_SYM),0,0},
-  { "HEAP",		SYM(HEAP_SYM),0,0},
   { "HELP",		SYM(HELP_SYM),0,0},
   { "HIGH_PRIORITY",	SYM(HIGH_PRIORITY),0,0},
   { "HOUR",		SYM(HOUR_SYM),0,0},
@@ -219,7 +218,6 @@ static SYMBOL symbols[] = {
   { "IF",		SYM(IF),0,0},
   { "IS",		SYM(IS),0,0},
   { "ISOLATION",	SYM(ISOLATION),0,0},
-  { "ISAM",		SYM(ISAM_SYM),0,0},
   { "ISSUER",		SYM(ISSUER_SYM),0,0},
   { "JOIN",		SYM(JOIN_SYM),0,0},
   { "KEY",		SYM(KEY_SYM),0,0},
@@ -268,9 +266,7 @@ static SYMBOL symbols[] = {
   { "MEDIUMBLOB",	SYM(MEDIUMBLOB),0,0},
   { "MEDIUMTEXT",	SYM(MEDIUMTEXT),0,0},
   { "MEDIUMINT",	SYM(MEDIUMINT),0,0},
-  { "MERGE",		SYM(MERGE_SYM),0,0},
   { "MEDIUM",		SYM(MEDIUM_SYM),0,0},
-  { "MEMORY",		SYM(MEMORY_SYM),0,0},
   { "MICROSECOND",	SYM(MICROSECOND_SYM),0,0},
   { "MIDDLEINT",	SYM(MEDIUMINT),0,0},	/* For powerbuilder */
   { "MIN_ROWS",		SYM(MIN_ROWS),0,0},
@@ -284,8 +280,6 @@ static SYMBOL symbols[] = {
   { "MULTILINESTRING",	SYM(MULTILINESTRING),0,0},
   { "MULTIPOINT",	SYM(MULTIPOINT),0,0},
   { "MULTIPOLYGON",	SYM(MULTIPOLYGON),0,0},
-  { "MRG_MYISAM",	SYM(MERGE_SYM),0,0},
-  { "MYISAM",		SYM(MYISAM_SYM),0,0},
   { "NAMES",		SYM(NAMES_SYM),0,0},
   { "NATURAL",		SYM(NATURAL),0,0},
   { "NATIONAL",		SYM(NATIONAL_SYM),0,0},
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index b9032381c45..981714cb942 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -861,7 +861,6 @@ extern MY_BITMAP temp_pool;
 extern String my_empty_string;
 extern String my_null_string;
 extern SHOW_VAR init_vars[],status_vars[], internal_vars[];
-extern struct show_table_type_st table_type_vars[];
 extern SHOW_COMP_OPTION have_isam;
 extern SHOW_COMP_OPTION have_innodb;
 extern SHOW_COMP_OPTION have_berkeley_db;
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index a0b5d910986..153520f4e93 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5417,13 +5417,12 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     break;
   case OPT_TABLE_TYPE:
   {
-    int type;
-    if ((type=find_type(argument, &ha_table_typelib, 2)) <= 0)
+    if ((enum db_type)((global_system_variables.table_type= 
+    	  ha_resolve_by_name(argument, strlen(argument)))) == DB_TYPE_UNKNOWN)
     {
       fprintf(stderr,"Unknown table type: %s\n",argument);
       exit(1);
     }
-    global_system_variables.table_type= type-1;
     break;
   }
   case OPT_SERVER_ID:
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 9b7be4afacc..4cae3827bf0 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -284,8 +284,8 @@ sys_var_thd_ulong	sys_sort_buffer("sort_buffer_size",
 					&SV::sortbuff_size);
 sys_var_thd_sql_mode    sys_sql_mode("sql_mode",
                                      &SV::sql_mode);
-sys_var_thd_enum        sys_table_type("table_type", &SV::table_type,
-                                       &ha_table_typelib);
+sys_var_thd_table_type  sys_table_type("table_type",
+				       &SV::table_type);
 sys_var_long_ptr	sys_table_cache_size("table_cache",
 					     &table_cache_size);
 sys_var_long_ptr	sys_thread_cache_size("thread_cache_size",
@@ -2403,6 +2403,61 @@ int set_var_password::update(THD *thd)
 #endif
 }
 
+/****************************************************************************
+ Functions to handle table_type
+****************************************************************************/
+
+bool sys_var_thd_table_type::check(THD *thd, set_var *var)
+  /* Based upon sys_var::check_enum() */
+{
+  char buff[80];
+  const char *value;
+  String str(buff, sizeof(buff), &my_charset_latin1), *res;
+
+  if (var->value->result_type() == STRING_RESULT)
+  {
+    if (!(res=var->value->val_str(&str)) ||
+	!(var->save_result.ulong_value=
+	 (ulong) ha_resolve_by_name(res->ptr(), res->length())))
+    {
+      value= res ? res->c_ptr() : "NULL";
+      goto err;
+    }
+    return 0;
+  }
+
+err:
+  my_error(ER_UNKNOWN_TABLE_ENGINE, MYF(0), value);
+  return 1;    
+}
+
+byte *sys_var_thd_table_type::value_ptr(THD *thd, enum_var_type type,
+					LEX_STRING *base)
+{
+  ulong val;
+  val= ((type == OPT_GLOBAL) ? global_system_variables.*offset :
+        thd->variables.*offset);
+  const char *table_type= ha_get_table_type((enum db_type)val);
+  return (byte *)table_type;
+}
+
+void sys_var_thd_table_type::set_default(THD *thd, enum_var_type type)
+{
+  if (type == OPT_GLOBAL)
+    global_system_variables.*offset= (ulong) DB_TYPE_MYISAM;
+  else
+    thd->variables.*offset= (ulong) (global_system_variables.*offset);
+}
+
+bool sys_var_thd_table_type::update(THD *thd, set_var *var)
+{
+  if (var->type == OPT_GLOBAL)
+    global_system_variables.*offset= var->save_result.ulong_value;
+  else
+    thd->variables.*offset= var->save_result.ulong_value;
+  return 0;
+}
+
 /****************************************************************************
  Functions to handle sql_mode
 ****************************************************************************/
diff --git a/sql/set_var.h b/sql/set_var.h
index 58ae53190e0..946341c4559 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -343,6 +343,26 @@ public:
 };
 
 
+class sys_var_thd_table_type :public sys_var_thd
+{
+protected:
+  ulong SV::*offset;
+public:
+  sys_var_thd_table_type(const char *name_arg, ulong SV::*offset_arg)
+    :sys_var_thd(name_arg), offset(offset_arg)
+  {}
+  bool check(THD *thd, set_var *var);
+SHOW_TYPE type() { return SHOW_CHAR; }
+  bool check_update_type(Item_result type)
+  {
+    return type != STRING_RESULT;		/* Only accept strings */
+  }
+  void set_default(THD *thd, enum_var_type type);
+  bool update(THD *thd, set_var *var);
+  byte *value_ptr(THD *thd, enum_var_type type, LEX_STRING *base);
+};
+
+
 class sys_var_thd_bit :public sys_var_thd
 {
   sys_update_func update_func;
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index c40765ebf94..a29d0f7dbe8 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -296,3 +296,4 @@ character-set=latin2
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 98540e1bd0a..8d3abbc8747 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -290,3 +290,4 @@ character-set=latin1
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 44c9399b821..23974c6083a 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -298,3 +298,4 @@ character-set=latin1
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index e4f7c27610b..0cf2d21d60b 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -287,3 +287,4 @@ character-set=latin1
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index dec488567ff..9b3977eedec 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -292,3 +292,4 @@ character-set=latin7
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index c41c927d539..469d945196a 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -287,3 +287,4 @@ character-set=latin1
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 0425a709950..025f3f5172e 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -299,3 +299,4 @@ character-set=latin1
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index 3cf5bbf592d..2247d3751a7 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -287,3 +287,4 @@ character-set=greek
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index f1b719ba716..5f1f30b6326 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -289,3 +289,4 @@ character-set=latin2
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index ed39950e9f1..c94deae2d77 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -287,3 +287,4 @@ character-set=latin1
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 9760cd3f9e8..16cf5816d03 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -289,3 +289,4 @@ character-set=ujis
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 10eed3bb2de..5bcdf2289e2 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -287,3 +287,4 @@ character-set=euckr
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 7149eea8b10..f4b6c073deb 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -289,3 +289,4 @@ character-set=latin1
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index dc96d39f8dc..3fc59dc6454 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -289,3 +289,4 @@ character-set=latin1
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index b2b2e52ad75..8dbec119d84 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -291,3 +291,4 @@ character-set=latin2
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index c4a150d79bf..6c69b986dbc 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -288,3 +288,4 @@ character-set=latin1
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index dce141da20a..8fad1a586dc 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -291,3 +291,4 @@ character-set=latin2
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 27c1b49f4f0..90d2e1afb5c 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -289,3 +289,4 @@ character-set=koi8r
 "Кеш запросов не может установить размер %lu, новый размер кеша зпросов - %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index 5311fa016dc..77b6b60a497 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -282,3 +282,4 @@ character-set=cp1250
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 9355e8fc0c4..49532d7f47a 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -295,3 +295,4 @@ character-set=latin2
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 3cdcc3967d7..2bfb1901d24 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -289,3 +289,4 @@ character-set=latin1
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 17dcdb89ae6..b0c927d46b1 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -287,3 +287,4 @@ character-set=latin1
 "Storleken av "Query cache" kunde inte sДttas till %lu, ny storlek Дr %lu",
 "Kolumn '%-.64s' kan inte vara del av ett FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index 99a09afde6c..7e5cc6e94e6 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -292,3 +292,4 @@ character-set=koi8u
 "Кеш запит╕в неспроможен встановити розм╕р %lu, новий розм╕р кеша запит╕в - %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
+"Unknown table engine '%s'",
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index e24102a5094..4181075cb9f 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -173,33 +173,6 @@ int mysqld_show_tables(THD *thd,const char *db,const char *wild)
 ** List all table types supported 
 ***************************************************************************/
 
-struct show_table_type_st {
-  const char *type;
-  SHOW_COMP_OPTION *value;
-  const char *comment;
-};
-
-
-SHOW_COMP_OPTION have_yes= SHOW_OPTION_YES;
-
-static struct show_table_type_st sys_table_types[]=
-{
-  {"MyISAM", &have_yes,
-   "Default type from 3.23 with great performance"},
-  {"HEAP"  , &have_yes,
-   "Hash based, stored in memory, useful for temporary tables"},
-  {"MERGE",  &have_yes,
-   "Collection of identical MyISAM tables"},
-  {"ISAM",   &have_isam,
-   "Obsolete table type; Is replaced by MyISAM"},
-  {"InnoDB", &have_innodb,
-   "Supports transactions, row-level locking and foreign keys"},
-  {"BDB",    &have_berkeley_db,
-   "Supports transactions and page-level locking"},
-  {NullS, NULL, NullS}
-};
-
-
 int mysqld_show_table_types(THD *thd)
 {
   List<Item> field_list;
@@ -213,8 +186,8 @@ int mysqld_show_table_types(THD *thd)
   if (protocol->send_fields(&field_list,1))
     DBUG_RETURN(1);
 
-  const char *default_type_name=
-    ha_table_typelib.type_names[thd->variables.table_type];
+  const char *default_type_name= 
+    ha_get_table_type((enum db_type)thd->variables.table_type);
 
   show_table_type_st *types;
   for (types= sys_table_types; types->type; types++)
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 8504a408605..dcb657bdce8 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -404,7 +404,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
     push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 			ER_WARN_USING_OTHER_HANDLER,
 			ER(ER_WARN_USING_OTHER_HANDLER),
-			ha_table_typelib.type_names[new_db_type],
+			ha_get_table_type(new_db_type),
 			table_name);
   }
   db_options=create_info->table_options;
@@ -2016,7 +2016,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
     push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 			ER_WARN_USING_OTHER_HANDLER,
 			ER(ER_WARN_USING_OTHER_HANDLER),
-			ha_table_typelib.type_names[new_db_type],
+			ha_get_table_type(new_db_type),
 			new_name);
   }
   if (create_info->row_type == ROW_TYPE_NOT_USED)
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 0dbe14fd2ab..3d5e4e616ab 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -241,7 +241,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
 %token	GROUP
 %token	HAVING
 %token	HASH_SYM
-%token	HEAP_SYM
 %token	HEX_NUM
 %token	HIGH_PRIORITY
 %token	HOSTS_SYM
@@ -257,7 +256,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
 %token	INTO
 %token	IN_SYM
 %token	ISOLATION
-%token	ISAM_SYM
 %token	JOIN_SYM
 %token	KEYS
 %token	KEY_SYM
@@ -296,10 +294,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
 %token	MAX_QUERIES_PER_HOUR
 %token	MAX_UPDATES_PER_HOUR
 %token	MEDIUM_SYM
-%token	MERGE_SYM
-%token	MEMORY_SYM
 %token	MIN_ROWS
-%token	MYISAM_SYM
 %token	NAMES_SYM
 %token	NATIONAL_SYM
 %token	NATURAL
@@ -1126,13 +1121,14 @@ create_table_option:
 	| INDEX DIRECTORY_SYM opt_equal TEXT_STRING_sys { Lex->create_info.index_file_name= $4.str; };
 
 table_types:
-	ISAM_SYM	{ $$= DB_TYPE_ISAM; }
-	| MYISAM_SYM	{ $$= DB_TYPE_MYISAM; }
-	| MERGE_SYM	{ $$= DB_TYPE_MRG_MYISAM; }
-	| HEAP_SYM	{ $$= DB_TYPE_HEAP; }
-	| MEMORY_SYM	{ $$= DB_TYPE_HEAP; }
-	| BERKELEY_DB_SYM { $$= DB_TYPE_BERKELEY_DB; }
-	| INNOBASE_SYM  { $$= DB_TYPE_INNODB; };
+	ident_or_text
+	{
+	  $$ = ha_resolve_by_name($1.str,$1.length);
+	  if ($$ == DB_TYPE_UNKNOWN) {
+	    net_printf(YYTHD, ER_UNKNOWN_TABLE_ENGINE, $1.str);
+	    YYABORT;
+	  }
+	};
 
 row_types:
 	DEFAULT		{ $$= ROW_TYPE_DEFAULT; }
@@ -4633,7 +4629,6 @@ keyword:
 	| GLOBAL_SYM		{}
 	| HANDLER_SYM		{}
 	| HASH_SYM		{}
-	| HEAP_SYM		{}
 	| HELP_SYM		{}
 	| HOSTS_SYM		{}
 	| HOUR_SYM		{}
@@ -4641,7 +4636,6 @@ keyword:
 	| IMPORT		{}
 	| INDEXES		{}
 	| ISOLATION		{}
-	| ISAM_SYM		{}
 	| ISSUER_SYM		{}
 	| INNOBASE_SYM		{}
 	| INSERT_METHOD		{}
@@ -4672,8 +4666,6 @@ keyword:
 	| MAX_QUERIES_PER_HOUR	{}
 	| MAX_UPDATES_PER_HOUR	{}
 	| MEDIUM_SYM		{}
-	| MERGE_SYM		{}
-	| MEMORY_SYM		{}
 	| MICROSECOND_SYM	{}
 	| MINUTE_SYM		{}
 	| MIN_ROWS		{}
@@ -4683,7 +4675,6 @@ keyword:
 	| MULTILINESTRING	{}
 	| MULTIPOINT		{}
 	| MULTIPOLYGON		{}
-	| MYISAM_SYM		{}
 	| NAMES_SYM		{}
 	| NATIONAL_SYM		{}
 	| NCHAR_SYM		{}

From fa432b3d7935c29b9194561de430414538ceaf1d Mon Sep 17 00:00:00 2001
From: "paul@ice.snake.net" <>
Date: Tue, 2 Dec 2003 18:14:56 -0600
Subject: [PATCH 03/12] benchmarks README edits

---
 sql-bench/README | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/sql-bench/README b/sql-bench/README
index 6b6a5fc95c0..a8468b4809b 100755
--- a/sql-bench/README
+++ b/sql-bench/README
@@ -1,27 +1,29 @@
 The MySQL Benchmarks
 
-These tests needs a MySQL version of at least 3.20.28 or 3.21.10.
-NOTE: With MySQL 3.20.# you have to use '--skip-in',  because MySQL 3.20
-doesn't support the IN operator.
+These tests require a MySQL version of at least 3.20.28 or 3.21.10.  NOTE:
+With MySQL 3.20.x, you must use the --skip-in option, because MySQL 3.20
+does not support the IN() operator.
 
 Currently the following servers are supported:
 MySQL 3.20 and 3.21, PostgreSQL 6.#, mSQL 2.# and Solid Server 2.2
 
-In this directory are the queries and raw data files used to populate
-the MySQL benchmarks. In order to run the benchmarks you should normally
-execute a command like the following:
+The benchmark directory contains the query files and raw data files used to
+populate the MySQL benchmark tables. In order to run the benchmarks, you
+should normally execute a command such as the following:
 
 run-all-tests --server=mysql --cmp=mysql,pg,solid --user=test --password=test --log
 
-The above means that one wants to run the benchmark with MySQL. The limits
-should be taken from all of mysql,PostgreSQL and Solid.  Login name and
-password is 'test'.  The result should be saved as a RUN file in the output
+This means that you want to run the benchmarks with MySQL. The
+limits should be taken from all of MySQL, PostgreSQL, and Solid.
+The login name and password for connecting to the server both are
+``test''.  The result should be saved as a RUN file in the output
 directory.
 
-When the above script has run you will have the individual results and the
+When run-all-tests has finished, will have the individual results and the
 the total RUN- file in the output directory.
 
-If you want to look at some old results, try:
+If you want to look at some old results, use the compare-results script.
+For example:
 
 compare-results --dir=Results --cmp=mysql,pg,solid
 compare-results --dir=Results --cmp=mysql,pg,solid --relative
@@ -29,8 +31,9 @@ compare-results --dir=Results --cmp=mysql,pg,solid --relative
 compare-results --dir=Results --cmp=msql,mysql,pg,solid
 compare-results --dir=Results --cmp=msql,mysql,pg,solid --relative
 
-compare-results --dir=results --server=mysql --same-server --cmp=mysql,pg,solid
+compare-results --dir=Results --server=mysql --same-server --cmp=mysql,pg,solid
 
+Some of the files in the benchmark directory are:
 
 File			Description
 
@@ -41,15 +44,15 @@ Makefile.am		Automake Makefile
 Overview-paper		A paper nicked from the net about database bench-
 			marking.
 README			This file.
-test-ATIS.sh		Cretation of 29 tables and a lot of selects on them.
+test-ATIS.sh		Creation of 29 tables and a lot of selects on them.
 test-connect.sh		Test how fast a connection to the server is.
 test-create.sh		Test how fast a table is created.
 test-insert.sh		Test create and fill of a table.
 test-wisconsin.sh	This is a port of the PostgreSQL version of this
 			benchmark.
-run-all-test		Use this to run all tests. When all test are run,
+run-all-tests		Use this to run all tests. When all tests are run,
 			use the --log --use-old option to get a RUN-file.
-compare-results		Makes a compare table from different RUN files.
+compare-results		Generates a comparison table from different RUN files.
 server-cfg		Contains the limit and functions for all supported
 			SQL servers.  If you want to add a new server, this
 			should be the only file that neads to be changed.
@@ -65,8 +68,8 @@ Useful options to all test-scripts (and run-all-tests):
 --host=#	Hostname for MySQL server (default: localhost)
 --db=#		Database to use (default: test)
 --fast		Allow use of any non-standard SQL extension to
-		do the get things done faster.
---skip-in	Don't do test with the IN operation (if the SQL server
+		get things done faster.
+--skip-in	Don't do test with the IN() operator (if the SQL server
 		hasn't implemented this, for example mSQL and MySQL 3.20).
 --lock-tables	Use table locking to get more speed.
 
@@ -81,13 +84,13 @@ systematically measure and compare the performance of relational
 database systems with database machines.  The benchmark is a
 single-user and single-factor experiment using a synthetic database
 and a controlled workload.  It measures the query optimization
-performance of database systems with 32 query types to exe cise the
+performance of database systems with 32 query types to exercise the
 components of the proposed systems.  The query suites include
 selection, join, projection, aggregate, and simple update queries.
 
 The test database consists of four generic relations.  The tenk
 relation is the key table and most used. Two data types of small
-integer number and character string are utilized.  Data values are
+integer numbers and character strings are utilized.  Data values are
 uniformly distributed. The primary metric is the query elapsed
 time. The main criticisms of the benchmark include the nature of
 single-user workload, the simplistic database structure, and the

From 5d323303cbb3514c8235fb544e2df5911dce262d Mon Sep 17 00:00:00 2001
From: "paul@ice.snake.net" <>
Date: Wed, 3 Dec 2003 11:48:34 -0600
Subject: [PATCH 04/12] Delete obsolete references.

---
 sql-bench/README | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/sql-bench/README b/sql-bench/README
index a8468b4809b..b0e1dfac5c1 100755
--- a/sql-bench/README
+++ b/sql-bench/README
@@ -1,8 +1,6 @@
 The MySQL Benchmarks
 
-These tests require a MySQL version of at least 3.20.28 or 3.21.10.  NOTE:
-With MySQL 3.20.x, you must use the --skip-in option, because MySQL 3.20
-does not support the IN() operator.
+These tests require a MySQL version of at least 3.20.28 or 3.21.10.
 
 Currently the following servers are supported:
 MySQL 3.20 and 3.21, PostgreSQL 6.#, mSQL 2.# and Solid Server 2.2
@@ -41,8 +39,6 @@ Data/ATIS		Contains data for 29 related tables used in the ATIS tests.
 Data/Wisconsin		Contains data for the Wisconsin benchmark.
 Results			Contains old benchmark results.
 Makefile.am		Automake Makefile
-Overview-paper		A paper nicked from the net about database bench-
-			marking.
 README			This file.
 test-ATIS.sh		Creation of 29 tables and a lot of selects on them.
 test-connect.sh		Test how fast a connection to the server is.
@@ -69,11 +65,9 @@ Useful options to all test-scripts (and run-all-tests):
 --db=#		Database to use (default: test)
 --fast		Allow use of any non-standard SQL extension to
 		get things done faster.
---skip-in	Don't do test with the IN() operator (if the SQL server
-		hasn't implemented this, for example mSQL and MySQL 3.20).
 --lock-tables	Use table locking to get more speed.
 
-From a text at http://www.mgt.ncu.edu.tw/CSIM/Paper/sixth/11.html
+From a text at http://www.mgt.ncu.edu.tw/CSIM/Paper/sixth/11.html:
 
 The Wisconsin Benchmark
 

From 93f84357c0f24eedd6f35aad37a858c24dd104b9 Mon Sep 17 00:00:00 2001
From: "paul@ice.snake.net" <>
Date: Wed, 3 Dec 2003 21:10:44 -0600
Subject: [PATCH 05/12] README:   minor edits

---
 sql-bench/README | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/sql-bench/README b/sql-bench/README
index b0e1dfac5c1..431659a8756 100755
--- a/sql-bench/README
+++ b/sql-bench/README
@@ -44,17 +44,16 @@ test-ATIS.sh		Creation of 29 tables and a lot of selects on them.
 test-connect.sh		Test how fast a connection to the server is.
 test-create.sh		Test how fast a table is created.
 test-insert.sh		Test create and fill of a table.
-test-wisconsin.sh	This is a port of the PostgreSQL version of this
-			benchmark.
+test-wisconsin.sh	A port of the PostgreSQL version of this benchmark.
 run-all-tests		Use this to run all tests. When all tests are run,
-			use the --log --use-old option to get a RUN-file.
+			use the --log and --use-old options to get a RUN-file.
 compare-results		Generates a comparison table from different RUN files.
-server-cfg		Contains the limit and functions for all supported
+server-cfg		Contains the limits and functions for all supported
 			SQL servers.  If you want to add a new server, this
 			should be the only file that neads to be changed.
 
 
-Most of the test should use portable SQL to make it possible to
+Most of the tests should use portable SQL to make it possible to
 compare different databases. Sometimes SQL extensions can make things
 a lot faster. In this case the test may use the extensions if the --fast
 option is used.

From 84acc2054f22cf0835a5cc744cf2343c69433d0e Mon Sep 17 00:00:00 2001
From: "lenz@kallisto.local" <>
Date: Thu, 4 Dec 2003 15:20:44 +0100
Subject: [PATCH 06/12]  - Bumped up version number in configure.in 4.1.1-alpha
 -> 4.1.2-alpha  - tagged ChangeSet 1.1641 as "mysql-4.1.1"

---
 .bzrignore   | 1 +
 configure.in | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.bzrignore b/.bzrignore
index e9de6662cb2..7a3629883af 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -640,3 +640,4 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
+INSTALL-WIN-SOURCE
diff --git a/configure.in b/configure.in
index 88622ececab..f46e48eaa1a 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
-AM_INIT_AUTOMAKE(mysql, 4.1.1-alpha)
+AM_INIT_AUTOMAKE(mysql, 4.1.2-alpha)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10

From bab592c3c09e7c1347fbf86b20e001bef730e73a Mon Sep 17 00:00:00 2001
From: "konstantin@oak.local" <>
Date: Thu, 4 Dec 2003 19:12:01 +0300
Subject: [PATCH 07/12] comment to user-level lock added

---
 sql/sql_class.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sql/sql_class.h b/sql/sql_class.h
index beb2de9c0a9..3ffff6f1871 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -505,6 +505,11 @@ public:
   // TODO: document the variables below
   MYSQL_LOCK	*lock;				/* Current locks */
   MYSQL_LOCK	*locked_tables;			/* Tables locked with LOCK */
+  /*
+    One thread can hold up to one named user-level lock. This variable
+    points to a lock object if the lock is present. See item_func.cc and
+    chapter 'Miscellaneous functions', for functions GET_LOCK, RELEASE_LOCK. 
+  */
   ULL		*ull;
   PREP_STMT	*last_prepared_stmt;
 #ifndef DBUG_OFF

From 66f777d36cb8ce4d09d0d77f974ec607d32dad56 Mon Sep 17 00:00:00 2001
From: "greg@mysql.com" <>
Date: Thu, 4 Dec 2003 11:54:04 -0500
Subject: [PATCH 08/12] Add charset #defines for Windows platform (as of 4.1.1)

---
 include/config-win.h | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/include/config-win.h b/include/config-win.h
index 4fdbfbbd02f..86318bddbcb 100644
--- a/include/config-win.h
+++ b/include/config-win.h
@@ -340,3 +340,38 @@ inline double ulonglong2double(ulonglong value)
 #define default_shared_memory_base_name "MYSQL"
 #define MYSQL_DEFAULT_CHARSET_NAME "latin1"
 #define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci"
+
+/* Define charsets you want */
+/* #undef HAVE_CHARSET_armscii8 */
+/* #undef HAVE_CHARSET_ascii */
+#define HAVE_CHARSET_big5 1
+#define HAVE_CHARSET_cp1250 1
+/* #undef HAVE_CHARSET_cp1251 */
+/* #undef HAVE_CHARSET_cp1256 */
+/* #undef HAVE_CHARSET_cp1257 */
+/* #undef HAVE_CHARSET_cp850 */
+/* #undef HAVE_CHARSET_cp852 */
+/* #undef HAVE_CHARSET_cp866 */
+/* #undef HAVE_CHARSET_dec8 */
+#define HAVE_CHARSET_euckr 1
+#define HAVE_CHARSET_gb2312 1
+#define HAVE_CHARSET_gbk 1
+/* #undef HAVE_CHARSET_greek */
+/* #undef HAVE_CHARSET_hebrew */
+/* #undef HAVE_CHARSET_hp8 */
+/* #undef HAVE_CHARSET_keybcs2 */
+/* #undef HAVE_CHARSET_koi8r */
+/* #undef HAVE_CHARSET_koi8u */
+#define HAVE_CHARSET_latin1 1
+#define HAVE_CHARSET_latin2 1
+/* #undef HAVE_CHARSET_latin5 */
+/* #undef HAVE_CHARSET_latin7 */
+/* #undef HAVE_CHARSET_macce */
+/* #undef HAVE_CHARSET_macroman */
+#define HAVE_CHARSET_sjis 1
+/* #undef HAVE_CHARSET_swe7 */
+#define HAVE_CHARSET_tis620 1
+#define HAVE_CHARSET_ucs2 1
+#define HAVE_CHARSET_ujis 1
+#define HAVE_CHARSET_utf8 1
+

From 1f024843413c6af617ba221c23c48cac58172f20 Mon Sep 17 00:00:00 2001
From: "antony@ltantony.rdg.cyberkinetica.homeunix.net" <>
Date: Thu, 4 Dec 2003 18:09:36 +0000
Subject: [PATCH 09/12] Fixup error number - Broke during merge

---
 mysql-test/t/create.test    | 4 ++--
 mysql-test/t/variables.test | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index 5fc027101aa..5bb7e420e1c 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -157,7 +157,7 @@ SELECT @@table_type;
 CREATE TABLE t1 (a int not null);
 show create table t1;
 drop table t1;
---error 1284
+--error 1285
 SET SESSION table_type="gemini";
 SELECT @@table_type;
 CREATE TABLE t1 (a int not null);
@@ -277,7 +277,7 @@ SELECT @@table_type;
 CREATE TABLE t1 (a int not null);
 show create table t1;
 drop table t1;
---error 1284
+--error 1285
 SET SESSION table_type="gemini";
 SELECT @@table_type;
 CREATE TABLE t1 (a int not null);
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index 241e0c73931..b5c402fe962 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -124,7 +124,7 @@ set big_tables="OFFF";
 set unknown_variable=1;
 --error 1232
 set max_join_size="hello";
---error 1284
+--error 1285
 set table_type=UNKNOWN_TABLE_TYPE;
 --error 1231
 set table_type=INNODB, big_tables=2;

From 3f1d0acbade5a8e2d1978a6378f4754f51dfa1e0 Mon Sep 17 00:00:00 2001
From: "serg@serg.mylan" <>
Date: Thu, 4 Dec 2003 21:58:28 +0100
Subject: [PATCH 10/12] make a clear distinction between max_word_length in
 *characters* and in *bytes*

---
 include/ft_global.h | 4 ++--
 myisam/ft_dump.c    | 2 +-
 myisam/ft_static.c  | 4 ++--
 myisam/ft_update.c  | 2 +-
 myisam/mi_check.c   | 6 +++---
 myisam/mi_create.c  | 4 ++--
 myisam/myisamchk.c  | 6 +++---
 myisam/sort.c       | 4 ++--
 sql/mysqld.cc       | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/include/ft_global.h b/include/ft_global.h
index df6860109e4..c30b0665216 100644
--- a/include/ft_global.h
+++ b/include/ft_global.h
@@ -26,8 +26,8 @@
 extern "C" {
 #endif
 
-#define FT_QUERY_MAXLEN 1024
-#define HA_FT_MAXLEN 254
+#define HA_FT_MAXBYTELEN 254
+#define HA_FT_MAXCHARLEN (HA_FT_MAXBYTELEN/3)
 
 typedef struct st_ft_info FT_INFO;
 struct _ft_vft
diff --git a/myisam/ft_dump.c b/myisam/ft_dump.c
index 8c40878cf00..47134af71d6 100644
--- a/myisam/ft_dump.c
+++ b/myisam/ft_dump.c
@@ -29,7 +29,7 @@ static my_bool verbose;
 static char *query=NULL;
 static uint lengths[256];
 
-#define MAX_LEN (HA_FT_MAXLEN+10)
+#define MAX_LEN (HA_FT_MAXBYTELEN+10)
 #define HOW_OFTEN_TO_WRITE 10000
 
 static struct my_option my_long_options[] =
diff --git a/myisam/ft_static.c b/myisam/ft_static.c
index cf4f3d6a02a..0dcea5bec0c 100644
--- a/myisam/ft_static.c
+++ b/myisam/ft_static.c
@@ -19,7 +19,7 @@
 #include "ftdefs.h"
 
 ulong ft_min_word_len=4;
-ulong ft_max_word_len=HA_FT_MAXLEN;
+ulong ft_max_word_len=HA_FT_MAXCHARLEN;
 ulong ft_query_expansion_limit=5;
 const char *ft_boolean_syntax="+ -><()~*:\"\"&|";
 
@@ -29,7 +29,7 @@ const HA_KEYSEG ft_keysegs[FT_SEGS]={
     63,                               /* language (will be overwritten) */
     0, 0, 0,                          /* null_bit, bit_start, bit_end */
     HA_VAR_LENGTH | HA_PACK_KEY,      /* flag */
-    HA_FT_MAXLEN,                     /* length */
+    HA_FT_MAXBYTELEN,                 /* length */
     HA_FT_WLEN,                       /* start */
     0,                                /* null_pos */
     NULL                              /* charset  */
diff --git a/myisam/ft_update.c b/myisam/ft_update.c
index b94a174b292..4015abbbeba 100644
--- a/myisam/ft_update.c
+++ b/myisam/ft_update.c
@@ -279,7 +279,7 @@ int _mi_ft_del(MI_INFO *info, uint keynr, byte *keybuf, const byte *record,
 uint _ft_make_key(MI_INFO *info, uint keynr, byte *keybuf, FT_WORD *wptr,
 		  my_off_t filepos)
 {
-  byte buf[HA_FT_MAXLEN+16];
+  byte buf[HA_FT_MAXBYTELEN+16];
   DBUG_ENTER("_ft_make_key");
 
 #if HA_FT_WTYPE == HA_KEYTYPE_FLOAT
diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index 6f794ad2ea8..6b2ad9744c4 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -1979,7 +1979,7 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info,
 
       sort_param.key_read=sort_ft_key_read;
       sort_param.key_write=sort_ft_key_write;
-      sort_param.key_length+=FT_MAX_WORD_LEN_FOR_SORT-HA_FT_MAXLEN;
+      sort_param.key_length+=FT_MAX_WORD_LEN_FOR_SORT-HA_FT_MAXBYTELEN;
     }
     else
     {
@@ -2375,7 +2375,7 @@ int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info,
     total_key_length+=sort_param[i].key_length;
 
     if (sort_param[i].keyinfo->flag & HA_FULLTEXT)
-      sort_param[i].key_length+=FT_MAX_WORD_LEN_FOR_SORT-ft_max_word_len;
+      sort_param[i].key_length+=FT_MAX_WORD_LEN_FOR_SORT-HA_FT_MAXBYTELEN;
   }
   sort_info.total_keys=i;
   sort_param[0].master= 1;
@@ -3913,7 +3913,7 @@ static my_bool mi_too_big_key_for_sort(MI_KEYDEF *key, ha_rows rows)
 {
   uint key_maxlength=key->maxlength;
   if (key->flag & HA_FULLTEXT)
-    key_maxlength+=FT_MAX_WORD_LEN_FOR_SORT-HA_FT_MAXLEN;
+    key_maxlength+=FT_MAX_WORD_LEN_FOR_SORT-HA_FT_MAXBYTELEN;
   return (key->flag & (HA_BINARY_PACK_KEY | HA_VAR_LENGTH_KEY | HA_FULLTEXT) &&
 	  ((ulonglong) rows * key_maxlength >
 	   (ulonglong) myisam_max_temp_length));
diff --git a/myisam/mi_create.c b/myisam/mi_create.c
index 0982e5bdaf6..9036ced751c 100644
--- a/myisam/mi_create.c
+++ b/myisam/mi_create.c
@@ -289,9 +289,9 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
       }
 
       fulltext_keys++;
-      key_length+= HA_FT_MAXLEN+HA_FT_WLEN;
+      key_length+= HA_FT_MAXBYTELEN+HA_FT_WLEN;
       length++;                              /* At least one length byte */
-      min_key_length_skipp+=HA_FT_MAXLEN;
+      min_key_length_skipp+=HA_FT_MAXBYTELEN;
     }
     else
     {
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c
index 61a1736c521..a7528a14353 100644
--- a/myisam/myisamchk.c
+++ b/myisam/myisamchk.c
@@ -322,11 +322,11 @@ static struct my_option my_long_options[] =
   { "decode_bits", OPT_DECODE_BITS, "", (gptr*) &decode_bits,
     (gptr*) &decode_bits, 0, GET_UINT, REQUIRED_ARG, 9L, 4L, 17L, 0L, 1L, 0},
   { "ft_min_word_len", OPT_FT_MIN_WORD_LEN, "", (gptr*) &ft_min_word_len,
-    (gptr*) &ft_min_word_len, 0, GET_ULONG, REQUIRED_ARG, 4, 1, HA_FT_MAXLEN,
+    (gptr*) &ft_min_word_len, 0, GET_ULONG, REQUIRED_ARG, 4, 1, HA_FT_MAXCHARLEN,
     0, 1, 0},
   { "ft_max_word_len", OPT_FT_MAX_WORD_LEN, "", (gptr*) &ft_max_word_len,
-    (gptr*) &ft_max_word_len, 0, GET_ULONG, REQUIRED_ARG, HA_FT_MAXLEN, 10,
-    HA_FT_MAXLEN, 0, 1, 0},
+    (gptr*) &ft_max_word_len, 0, GET_ULONG, REQUIRED_ARG, HA_FT_MAXCHARLEN, 10,
+    HA_FT_MAXCHARLEN, 0, 1, 0},
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
diff --git a/myisam/sort.c b/myisam/sort.c
index 651b2331cd1..e28df1657a7 100644
--- a/myisam/sort.c
+++ b/myisam/sort.c
@@ -156,7 +156,7 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages,
       while ((maxbuffer= (int) (records/(keys-1)+1)) != skr);
 
     if ((sort_keys=(uchar **)my_malloc(keys*(sort_length+sizeof(char*))+
-				       HA_FT_MAXLEN, MYF(0))))
+				       HA_FT_MAXBYTELEN, MYF(0))))
     {
       if (my_init_dynamic_array(&buffpek, sizeof(BUFFPEK), maxbuffer,
 			     maxbuffer/2))
@@ -365,7 +365,7 @@ pthread_handler_decl(thr_find_all_keys,arg)
     }
     if ((sort_keys=(uchar **)my_malloc(keys*(sort_length+sizeof(char*))+
 				       ((info->keyinfo->flag & HA_FULLTEXT) ?
-					HA_FT_MAXLEN : 0), MYF(0))))
+					HA_FT_MAXBYTELEN : 0), MYF(0))))
     {
       if (my_init_dynamic_array(&info->buffpek, sizeof(BUFFPEK),
 				maxbuffer, maxbuffer/2))
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 2a5f639a440..895941503ab 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4223,11 +4223,11 @@ replicating a LOAD DATA INFILE command.",
   { "ft_min_word_len", OPT_FT_MIN_WORD_LEN,
     "The minimum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable.",
     (gptr*) &ft_min_word_len, (gptr*) &ft_min_word_len, 0, GET_ULONG,
-    REQUIRED_ARG, 4, 1, HA_FT_MAXLEN, 0, 1, 0},
+    REQUIRED_ARG, 4, 1, HA_FT_MAXCHARLEN, 0, 1, 0},
   { "ft_max_word_len", OPT_FT_MAX_WORD_LEN,
     "The maximum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable.",
     (gptr*) &ft_max_word_len, (gptr*) &ft_max_word_len, 0, GET_ULONG,
-    REQUIRED_ARG, HA_FT_MAXLEN, 10, HA_FT_MAXLEN, 0, 1, 0},
+    REQUIRED_ARG, HA_FT_MAXCHARLEN, 10, HA_FT_MAXCHARLEN, 0, 1, 0},
   { "ft_query_expansion_limit", OPT_FT_QUERY_EXPANSION_LIMIT,
     "Number of best matches to use for query expansion",
     (gptr*) &ft_query_expansion_limit, (gptr*) &ft_query_expansion_limit, 0, GET_ULONG,

From cbcb863ca5475cf0fcce4fd1f6fe59dfac1f9daf Mon Sep 17 00:00:00 2001
From: "serg@serg.mylan" <>
Date: Thu, 4 Dec 2003 23:18:04 +0100
Subject: [PATCH 11/12] test result fixed

---
 mysql-test/r/fulltext_var.result | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/r/fulltext_var.result b/mysql-test/r/fulltext_var.result
index f45e18a9591..89d477c1a7c 100644
--- a/mysql-test/r/fulltext_var.result
+++ b/mysql-test/r/fulltext_var.result
@@ -2,6 +2,6 @@ show variables like "ft\_%";
 Variable_name	Value
 ft_boolean_syntax	+ -><()~*:""&|
 ft_min_word_len	4
-ft_max_word_len	254
+ft_max_word_len	84
 ft_query_expansion_limit	20
 ft_stopword_file	(built-in)

From a942f557168c33ff131e67c0555b17d4413bafe2 Mon Sep 17 00:00:00 2001
From: "konstantin@oak.local" <>
Date: Fri, 5 Dec 2003 01:55:57 +0300
Subject: [PATCH 12/12] unused variable max_prep_stmt_count removed

---
 sql/mysqld.cc   | 7 +------
 sql/set_var.cc  | 4 ----
 sql/sql_class.h | 1 -
 sql/unireg.h    | 1 -
 4 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 2a5f639a440..926d55313ec 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3597,7 +3597,7 @@ enum options_mysqld
   OPT_MAX_SEEKS_FOR_KEY, OPT_MAX_TMP_TABLES, OPT_MAX_USER_CONNECTIONS,
   OPT_MAX_LENGTH_FOR_SORT_DATA,
   OPT_MAX_WRITE_LOCK_COUNT, OPT_BULK_INSERT_BUFFER_SIZE,
-  OPT_MAX_ERROR_COUNT, OPT_MAX_PREP_STMT,
+  OPT_MAX_ERROR_COUNT,
   OPT_MYISAM_BLOCK_SIZE, OPT_MYISAM_MAX_EXTRA_SORT_FILE_SIZE,
   OPT_MYISAM_MAX_SORT_FILE_SIZE, OPT_MYISAM_SORT_BUFFER_SIZE,
   OPT_NET_BUFFER_LENGTH, OPT_NET_RETRY_COUNT,
@@ -4386,11 +4386,6 @@ The minimum value for this variable is 4096.",
     (gptr*) &global_system_variables.max_length_for_sort_data,
     (gptr*) &max_system_variables.max_length_for_sort_data, 0, GET_ULONG,
     REQUIRED_ARG, 1024, 4, 8192*1024L, 0, 1, 0},
-  {"max_prepared_statements", OPT_MAX_PREP_STMT,
-   "Max number of prepared_statements for a thread.",
-   (gptr*) &global_system_variables.max_prep_stmt_count,
-   (gptr*) &max_system_variables.max_prep_stmt_count, 0, GET_ULONG,
-   REQUIRED_ARG, DEFAULT_PREP_STMT_COUNT, 0, ~0L, 0, 1, 0},
   {"max_relay_log_size", OPT_MAX_RELAY_LOG_SIZE,
    "If non-zero: relay log will be rotated automatically when the size exceeds this value; if zero (the default): when the size exceeds max_binlog_size. 0 expected, the minimum value for this variable is 4096.",
    (gptr*) &max_relay_log_size, (gptr*) &max_relay_log_size, 0, GET_ULONG,
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 5b956cd9c76..e46fe9729d5 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -202,8 +202,6 @@ sys_var_thd_ha_rows	sys_sql_max_join_size("sql_max_join_size",
 					      &SV::max_join_size,
 					      fix_max_join_size);
 #endif
-sys_var_thd_ulong	sys_max_prep_stmt_count("max_prepared_statements",
-						&SV::max_prep_stmt_count);
 sys_var_long_ptr	sys_max_relay_log_size("max_relay_log_size",
                                                &max_relay_log_size,
                                                fix_max_relay_log_size);
@@ -462,7 +460,6 @@ sys_var *sys_variables[]=
   &sys_max_heap_table_size,
   &sys_max_join_size,
   &sys_max_length_for_sort_data,
-  &sys_max_prep_stmt_count,
   &sys_max_relay_log_size,
   &sys_max_seeks_for_key,
   &sys_max_sort_length,
@@ -653,7 +650,6 @@ struct show_var_st init_vars[]= {
   {sys_max_seeks_for_key.name,  (char*) &sys_max_seeks_for_key,	    SHOW_SYS},
   {sys_max_length_for_sort_data.name, (char*) &sys_max_length_for_sort_data,
    SHOW_SYS},
-  {sys_max_prep_stmt_count.name,(char*) &sys_max_prep_stmt_count,   SHOW_SYS},
   {sys_max_sort_length.name,	(char*) &sys_max_sort_length,	    SHOW_SYS},
   {sys_max_user_connections.name,(char*) &sys_max_user_connections, SHOW_SYS},
   {sys_max_tmp_tables.name,	(char*) &sys_max_tmp_tables,	    SHOW_SYS},
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 3ffff6f1871..1fce0049269 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -373,7 +373,6 @@ struct system_variables
   ulong max_error_count;
   ulong max_heap_table_size;
   ulong max_length_for_sort_data;
-  ulong max_prep_stmt_count;
   ulong max_sort_length;
   ulong max_tmp_tables;
   ulong myisam_repair_threads;
diff --git a/sql/unireg.h b/sql/unireg.h
index 2da25edd72a..442809a9e08 100644
--- a/sql/unireg.h
+++ b/sql/unireg.h
@@ -84,7 +84,6 @@
 #define TRANS_MEM_ROOT_PREALLOC   4096
 
 #define DEFAULT_ERROR_COUNT	64
-#define DEFAULT_PREP_STMT_COUNT	64
 #define EXTRA_RECORDS	10			/* Extra records in sort */
 #define SCROLL_EXTRA	5			/* Extra scroll-rows. */
 #define FIELD_NAME_USED ((uint) 32768)		/* Bit set if fieldname used */