Merge paul@work.mysql.com:/home/bk/mysql-4.0

into teton.kitebird.com:/home/paul/mysql-4.0

BitKeeper/etc/logging_ok

@@ -82,3 +82,4 @@ worm@altair.is.lan
 zak@balfor.local
 zak@linux.local
 zgreant@mysql.com
+tfr@beta.frontier86.ee

Build-tools/mysql-copyright

@@ -89,7 +89,7 @@ sub main
     }
     
     # everything should be ok, continue with extracting..
-    `gtar xfz ../$distfile`;
+    `tar xfz ../$distfile`;
     $pec= $? >> 8;
     abort($dir, "Extracting from tar failed!\n") if ($pec);
 
@@ -107,7 +107,7 @@ sub main
     `mv -f $destdir $newdistname`;
     
     # tar the new distribution
-    `gtar cz -f $opt_target/$newdistname.tar.gz *`;
+    `tar cz -f $opt_target/$newdistname.tar.gz *`;
     $pec= $? >> 8;
     abort($dir, "Making new tar archive failed!\n") if ($pec);
   

Docs/manual.texi

@@ -49171,225 +49171,6 @@ By Thomas Thaele @email{tthaele@@papenmeier.de}
 
 @appendixsec  Clients
 
-@itemize @bullet
-@item Graphical clients
-@itemize @minus
-@item @uref{http://www.ideit.com/products/dbvis/}
-DbVisualizer, a freeware JDBC client to graphically visualise
-the data and structure of several databases simultaneously.
-By Innovative-IT Development AB.
-
-@item @uref{http://www.mysql.com/downloads/gui-clients.html}
-MySQLGUI, the MySQL GUI client homepage. By Sinisa at MySQL AB.
-
-@item @uref{http://www.mysql.com/Downloads/Contrib/mysql_navigator_0.9.0.tar.gz}
-MySQL Navigator is a MySQL database server GUI client program, distributed
-under GPL license. The purpose of MySQL Navigator is to provide a useful
-client interface to MySQL database servers, whilst supporting multiple
-operating systems and languages. You can currently import/export database,
-enter queries, get result sets, edit scripts, run scripts, add, alter, and
-delete users, and retrieve client and server information. Uses QT 2.2.
-The homepage for MySQL Navigator is at @uref{http://sql.kldp.org/mysql/}.
-
-@item @uref{http://www.mysql.com/Downloads/Win32/secman.zip}
-A user and security management GUI for MySQL on Windows.
-By Martin Jeremic.
-The homepage for MySQL Security GUI is at @uref{http://jsoft.webjump.com/}.
-
-@item @uref{http://www.mysql.com/Downloads/Contrib/kmysqladmin-0.4.1.tar.gz}.
-@item @uref{http://www.mysql.com/Downloads/Contrib/kmysqladmin-0.4.1-1.src.rpm}.
-@item @uref{http://www.mysql.com/Downloads/Contrib/kmysqladmin-0.4.1-1.i386.rpm}
-An administration tool for the MySQL server using QT / KDE.  Tested
-only on Linux.
-
-@item @uref{http://www.mysql.com/Downloads/Contrib/mysql-admin-using-java+swing.tar.gz}
-Java client using Swing, by Fredy Fischer (@email{se-afs@@dial.eunet.ch}).
-You can always find the latest version at
-@uref{http://www.trash.net/~ffischer/admin/}.
-
-@item @uref{http://www.mysql.com/Downloads/Win32/MySQL-Maker-1.0.zip}.
-Shareware MySQL client for Windows. It's a WYSIWYG tool which allows
-you to create, change and delete databases and tables.
-You can change field - structure and add, change and delete data in
-these tables directly without ODBC-driver.
-The MySQL Maker homepage is at @uref{http://www.presult.de/presult/frames/fs_mysqlmaker.html}.
-
-@item @uref{http://www.mysql.com/Downloads/Contrib/mysqlwinadmn.zip}
-Windows GUI (binary only) to administrate a database, by David B. Mansel,
-@email{david@@zhadum.org}.
-
-@item @uref{http://home.online.no/~runeberg/myqa/}
-MyQA is a Linux-based query client for the MySQL database server. MyQA
-lets you enter SQL queries, execute them, and view the results, all in a
-graphical user interface. The GUI is roughly similar to that of the
-'Query Analyzer' client that comes with MS SQL Server.
-
-@item @uref{http://www.opex.atnet.ru/mysqlmanager/}
-MySQL Manager is a graphical MySQL server manager for MySQL server
-written in Java.
-
-@item @uref{http://www.mysql.com/Downloads/Win32/netadmin.zip}
-An administrator tool for MySQL on Windows 95/98 and Windows NT
-4.0. Only tested with MySQL Versions 3.23.5 - 3.23.7. Written
-using the Tmysql components.
-
-You can write queries and show tables, indexes, table syntax, and
-administrate user, host, and database and so on. This is beta and
-still has some bugs. You can test the program with all features. Please
-send bugs and hints to Marco Suess @email{ms@@it-netservice.de}. Original
-URL @uref{http://www.it-netservice.de/pages/software/}.
-
-@item @uref{http://www.mysql.com/Downloads/Win32/netadmin2.zip}
-New version of netadmin. See above for details.
-
-@item @uref{http://www.mysql.com/Downloads/Win32/ARTADMIN203.EXE}
-Atronic's MySQL client for Windows 2.0.3.0.
-The home page for this can be found at @uref{http://www.artronic.hr/}.
-
-@item @uref{http://www.mysql.com/Downloads/Win32/W9xstop.zip}
-Utility from Artronic to stop MySQL on win9x.
-
-@item @uref{http://bardo.hyperlink.cz/mysqlmon/}
-A light weight GUI client for Windows.
-
-@item @uref{http://www.mysqlfront.de/}
-MySQLfront is a very nice Windows client with lots of useful features.
-By Angsar Becker.
-
-@item @uref{http://www.dbtools.com.br/}
-Dbtools, a tool to manage MySQL databases. Currently only for Windows.
-Some features:
-@itemize @bullet
-@item Manage servers, databases, tables, columns, indexes, and users
-@item Import wizard to import structure and data from MS Access, MS Excel, Dbase, FoxPro, Paradox, and ODBC Databases.
-
-@item @uref{http://www.mysql.com/Downloads/Contrib/KMYENG113.zip}
-An administrator GUI for MySQL. Works only on Windows, no source.
-Available in English and Japanese. By Mitunobu Kaneko.
-Home page: @uref{http://sql.jnts.ne.jp/}
-@end itemize
-
-@item @uref{http://www.mysql.com/Downloads/Contrib/xmysqladmin-1.0.tar.gz}
-An X-based front end to the MySQL database engine.  It allows reloads,
-status check, process control, myisamchk, grant/revoke privileges,
-creating databases, dropping databases, create, alter, browse, and drop
-tables.  Originally by Gilbert Therrien, @email{gilbert@@ican.net} but
-now in public domain and supported by MySQL AB.
-
-@item @uref{http://www.mysql.com/Downloads/Contrib/xmysql-1.9.tar.gz}.
-xmysqlA front end to the MySQL database engine. It allows for simple
-queries and table maintenance, as well as batch queries. By Rick
-Mehalick, @email{dblhack@@wt.net}.
-The xmysql homepage is at @uref{http://web.wt.net/~dblhack/}
-Requires @uref{http://bragg.phys.uwm.edu/xforms/} (xforms 0.88) to work.
-
-@item @uref{http://www.tamos.net/sw/dbMetrix/}
-dbMatrix is an @code{Open Source} client for exploring databases and executing
-SQL. Supports MySQL, Oracle, PostgreSQL, and mSQL.
-
-@item @uref{http://www.multimania.com/bbrox/GtkSQL/}
-GtkSQL is a query tool for MySQL and PostgreSQL.
-
-@item @uref{http://dbman.linux.cz/}
-dbMan is a query tool written in Perl. Uses DBI and Tk.
-
-@item @uref{http://www.mysql.com/Downloads/Win32/Msc201.EXE} (Mascon 202)
-@item @uref{http://www.mysql.com/Downloads/Win32/FrMsc202.EXE} (Free Mascon 202)
-Mascon is a powerful Win32 GUI for the administering MySQL server
-databases. Mascon's features include visual table design, connections to
-multiple servers, data and blob editing of tables, security setting, SQL
-color coding, dump functionality and much more.
-The Mascon homepage is at @uref{http://www.scibit.com/Products/Software/Utils/Mascon.asp}.
-@item @uref{http://www.virtualbeer.net/dbui/}
-DBUI is a Gtk graphical database editor.
-@item @uref{http://www.rtlabs.com/}
-MacSQL is a GUI for MySQL, ODBC, and JDBC databases for the Mac OS.
-@item @uref{http://www.caleb.com.au/}
-JRetriever is a generic database front-end tool for JDBC compliant
-databases written with Java 2. JRetriever displays database
-tables/views in a Windows explorer-like front end. Users can retrieve
-data either by clicking on the table folder or by composing their own SQL
-statements with our built-in SQL editor. The tool has been tested with
-Oracle 8 and MySQL as the back-end databases. It requires JDK 1.3 from
-JavaSoft.
-@item @uref{http://www.jetools.com/products/databrowser/}
-The DataBrowser is a cross-database, cross-platform data access tool. It is more
-user friendly than tools like SQL Plus, psql (command-line based tools). It is more
-flexible than TOAD, ISQL, PGAccess which are GUI's that are limitied to a single
-platform or database.
-@item @uref{http://www.intrex.net/amit/software/}
-The SQL Console is a standalone java application that allows you to connect to a
- SQL database system and issue SQL queries and updates. It has an easy-to use
-graphical user interface. The SQL Console uses JDBC to connect to the database
-systems and, therefore, with proper JDBC drivers, you can use this utility to
-connect to some of the most popular database systems.
-@item @uref{http://www.mysql.com/Downloads/Contrib/mysql_mmc.zip}
-MySQL MMC is a GUI Management Tool developed using kdevelop
-with a very good interface completely like Microsoft
-Enterprise Tool (for SQL Server) or Sybase Central. We
-can use it to manage server, database, table, index,
-users and to edit table data in grid or execute Sql
-by Query Analysis.
-@end itemize
-
-@cindex Web clients
-@item Web Clients
-@itemize @minus
-@item @uref{http://www.mysql.com/Downloads/Contrib/mysqladmin-atif-1.0.tar.gz}
-WWW MySQL administrator for the @code{user,} @code{db} and
-@code{host} tables.  By Tim Sailer, modified by Atif Ghaffar
-@email{aghaffar@@artemedia.ch}.
-
-@item @uref{http://www.mysql.com/Downloads/Contrib/mysql-webadmin-1.0a8-rz.tar.gz}
-A tool written in PHP-FI to administrate MySQL databases
-remotely over the web within a web-browser. By Peter Kuppelwieser,
-@email{peter.kuppelwieser@@kantea.it}. Updated by Wim Bonis,
-@email{bonis@@kiss.de}. Not maintained anymore!
-
-@item @uref{http://www.mysql.com/Downloads/Contrib/mysqladm.tar.gz}
-MySQL Web Database Administration written in Perl.  By Tim Sailer.
-
-@item @uref{http://www.mysql.com/Downloads/Contrib/mysqladm-2.tar.gz}
-Updated version of @file{mysqladm.tar.gz}, by High Tide.
-
-@item @uref{http://www.mysql.com/Downloads/Contrib/billowmysql.zip}
-Updated version of @file{mysqladm.tar.gz}, by Ying Gao.  You can get the
-newest version from @uref{http://civeng.com/sqldemo/} (the home site).
-
-@item @uref{http://www.mysql.com/Downloads/Contrib/myadmin-0.4.tar.gz}.
-MyAdmin is a web-based MySQL administrator by Mike Machado.
-TheMyAdmin homepage is at @uref{http://myadmin.cheapnet.net/}
-
-@item @uref{http://www.mysql.com/Downloads/Contrib/phpMyAdmin_2.2.0.tar.gz}
-A set of PHP3-scripts to adminstrate MySQL over the WWW.
-
-@item @uref{http://www.phpwizard.net/projects/phpMyAdmin/}
-phpMyAdmin is a PHP3 tool in the spirit of mysql-webadmin, by Tobias Ratschiller, tobias@@dnet.it.
-
-@item @uref{http://www.mysql.com/Downloads/Contrib/useradm.tar.gz}
-MySQL administrator in PHP. By Ofni Thomas
-@email{othomas@@vaidsystems.com}.
-
-@item @uref{http://gossamer-threads.com/perl/mysqlman/mysql.cgi}
-MySQLMan has similar functionality to phpmyadmin, but written with
-Perl and using html templates. By Alex Krohn.
-@end itemize
-
-@item @uref{http://www.mysql.com/Downloads/Contrib/mysql-editor.tar.gz}
-This cgi scripts in Perl enables you to edit content of Mysql
-database. By Tomas Zeman.
-
-@item @uref{http://worldcommunity.com/opensource/futuresql/}
-FutureSQL by Peter F. Brown, is a free, @code{Open Source} rapid application
-development web database administration tool, written in Perl,
-using MySQL. It uses @code{DBI:DBD} and @code{CGI.pm}.
-
-FutureSQL allows one to easily set up config files to view, edit, delete,
-and otherwise process records from a MySQL database. It uses a data
-dictionary, configuration files and templates, and allows "pre-processing"
-and "post-processing" on both fields, records, and operations.
-@end itemize
-
 @cindex web tools
 @cindex tools,, web
 @appendixsec Web Tools
@@ -51274,6 +51055,8 @@ not yet 100% confident in this code.
 @appendixsubsec Changes in release 3.23.53
 @itemize @bullet
 @item
+Fixed that @code{SHOW STATUS} doesn't reset @code{Delayed_insert_threads}.
+@item
 Fixed core dump bug when using the @code{BINARY} cast on a @code{NULL} value.
 @item
 Fixed race condition when someone did a @code{GRANT} at the same time a new

acinclude.m4

@@ -800,7 +800,7 @@ dnl get substituted.
 AC_DEFUN(MYSQL_CHECK_ORBIT, [
 AC_MSG_CHECKING(for ORBit)
 orbit_config_path=`which orbit-config`
-if test -n "$orbit_config_path"
+if test -n "$orbit_config_path" -a $? = 0
 then
   orbit_exec_prefix=`orbit-config --exec-prefix`
   orbit_includes=`orbit-config --cflags server`

sql/ha_heap.h

@@ -41,13 +41,14 @@ class ha_heap: public handler
   {
     return (HA_READ_RND_SAME | HA_NO_INDEX | HA_KEYPOS_TO_RNDPOS |
 	    HA_NO_BLOBS | HA_NULL_KEY | HA_REC_NOT_IN_SEQ |
-	    HA_NOT_READ_PREFIX_LAST | HA_NO_AUTO_INCREMENT);
+	    HA_NO_AUTO_INCREMENT);
   }
   ulong index_flags(uint inx) const
   {
     return ((table->key_info[inx].algorithm == HA_KEY_ALG_BTREE) ?
 	    (HA_READ_NEXT | HA_READ_PREV | HA_READ_ORDER) :
-	    (HA_ONLY_WHOLE_INDEX | HA_WRONG_ASCII_ORDER));
+	    (HA_ONLY_WHOLE_INDEX | HA_WRONG_ASCII_ORDER |
+	     HA_NOT_READ_PREFIX_LAST));
   }
   uint max_record_length() const { return HA_MAX_REC_LENGTH; }
   uint max_keys()          const { return MAX_KEY; }

sql/ha_isammrg.h

@@ -33,9 +33,9 @@ class ha_isammrg: public handler
   const char *table_type() const { return "MRG_ISAM"; }
   const char **bas_ext() const;
   ulong table_flags() const { return (HA_READ_RND_SAME | HA_KEYPOS_TO_RNDPOS |
-				      HA_NOT_READ_PREFIX_LAST |
 				      HA_REC_NOT_IN_SEQ); }
-  ulong index_flags(uint idx) const { return 0; }
+  ulong index_flags(uint idx) const { return HA_NOT_READ_PREFIX_LAST; }
+
   uint max_record_length() const { return HA_MAX_REC_LENGTH; }
   uint max_keys()          const { return 0; }
   uint max_key_parts()     const { return 0; }

sql/handler.h

@@ -81,7 +81,7 @@
 #define HA_READ_PREV		4	/* Read prev. record with same key */
 #define HA_READ_ORDER		8	/* Read through record-keys in order */
 #define HA_ONLY_WHOLE_INDEX	16	/* Can't use part key searches */
-#define HA_NOT_READ_PREFIX_LAST	32
+#define HA_NOT_READ_PREFIX_LAST	32	/* No support for index_read_last() */
 #define HA_KEY_READ_ONLY	64	/* Support HA_EXTRA_KEYREAD */
 
 /*

sql/mysqld.cc

@@ -3736,7 +3736,7 @@ struct show_var_st status_vars[]= {
   {"Created_tmp_disk_tables",  (char*) &created_tmp_disk_tables,SHOW_LONG},
   {"Created_tmp_tables",       (char*) &created_tmp_tables,     SHOW_LONG},
   {"Created_tmp_files",	       (char*) &my_tmp_file_created,	SHOW_LONG},
-  {"Delayed_insert_threads",   (char*) &delayed_insert_threads, SHOW_LONG},
+  {"Delayed_insert_threads",   (char*) &delayed_insert_threads, SHOW_LONG_CONST},
   {"Delayed_writes",           (char*) &delayed_insert_writes,  SHOW_LONG},
   {"Delayed_errors",           (char*) &delayed_insert_errors,  SHOW_LONG},
   {"Flush_commands",           (char*) &refresh_version,        SHOW_LONG_CONST},

sql/sql_select.cc

@@ -5576,7 +5576,7 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit,
 	    Use a traversal function that starts by reading the last row
 	    with key part (A) and then traverse the index backwards.
 	  */
-	  if (table->file->table_flags() & HA_NOT_READ_PREFIX_LAST)
+	  if (table->file->index_flags(ref_key) & HA_NOT_READ_PREFIX_LAST)
 	    DBUG_RETURN(0);			// Use filesort
 	  tab->read_first_record=       join_read_last_key;
 	  tab->read_record.read_record= join_read_prev_same;

support-files/mysql.spec.sh

@@ -519,7 +519,7 @@ fi
   take care of this
 - reorganized the file list: actually install man pages along
   with the binaries of the respective subpackage
-- dont include libmysqld.a in the devel subpackage as well, if we
+- do not include libmysqld.a in the devel subpackage as well, if we
   have a special "embedded" subpackage
 - reworked the package descriptions