Added all changes from old 4.0 version:

PSTACK, libmysqld and MySQL filesystem
UPDATE ... ORDER BY
DELETE ... ORDER BY
New faster fulltext handling
Faster compressed keys



Makefile.am:
  Added support for pstack and libmysqld_dir
acconfig.h:
  MySQL filesystem and PSTACK
acinclude.m4:
  MySQL File system
client/mysql.cc:
  Support for --xml
configure.in:
  Pstack, MySQL FS and libmysqld_dir
include/ft_global.h:
  Faster fulltext
include/my_pthread.h:
  Made c++ safe
include/myisam.h:
  Update for faster fulltext
include/mysql_com.h:
  new my_net_read()
include/violite.h:
  libmysqld
libmysql/net.c:
  New protocol that supports big packets
myisam/Makefile.am:
  Faster fulltext
myisam/ft_parser.c:
  Faster fulltext
myisam/ft_search.c:
  Faster fulltext
myisam/ft_update.c:
  Faster fulltext
myisam/ftdefs.h:
  Faster fulltext
myisam/mi_check.c:
  Faster fulltext
myisam/mi_open.c:
  Faster compressed keys
myisam/mi_search.c:
  Faster compressed keys
myisam/mi_update.c:
  Faster compressed keys
myisam/myisamdef.h:
  Faster compressed keys
myisam/sort.c:
  Faster compressed keys
mysql-test/mysql-test-run.sh:
  --skip-innobase and --skip-bdb
sql/ChangeLog:
  Changelog
sql/Makefile.am:
  PSTACK
sql/mysql_priv.h:
  New ORDER BY options and libmysqld
sql/mysqld.cc:
  PSTACK
sql/net_serv.cc:
  New protocol that supports big packets
sql/share/estonian/errmsg.txt:
  New error messages
sql/sql_base.cc:
  Better list_open_tabels
sql/sql_delete.cc:
  ORDER BY for delete
sql/sql_lex.cc:
  Added language convertation of all strings
sql/sql_parse.cc:
  Changes for libmysqld
  Use new ORDER BY options
sql/sql_show.cc:
  Character set convertations
  Use new list_open_tables function.
sql/sql_update.cc:
  UPDATE ... ORDER BY
sql/sql_yacc.yy:
  Clean up symbol definitions
  DELETE .. ORDER BY
  UPDATE .. ORDER BY
sql/table.h:
  new OPEN_TABLE_LIST structure
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

1 files changed, 38 insertions, 8 deletions

diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 87a2f5c7b2b..3cba3b4be6a 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -1,15 +1,15 @@
 /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult 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 */
@@ -40,8 +40,12 @@ static bool compare_record(TABLE *table, ulong query_id)
 }
 
 
-int mysql_update(THD *thd,TABLE_LIST *table_list,List<Item> &fields,
-		 List<Item> &values, COND *conds,
+int mysql_update(THD *thd,
+                 TABLE_LIST *table_list,
+                 List<Item> &fields,
+		 List<Item> &values,
+                 COND *conds,
+                 ORDER *order,
 		 ha_rows limit,
 		 enum enum_duplicates handle_duplicates,
 		 thr_lock_type lock_type)
@@ -163,6 +167,32 @@ int mysql_update(THD *thd,TABLE_LIST *table_list,List<Item> &fields,
       table->key_read=1;
       table->file->extra(HA_EXTRA_KEYREAD);
     }
+
+    if (order)
+    {
+      uint         length;
+      SORT_FIELD  *sortorder;
+      TABLE_LIST   tables;
+      List<Item>   fields;
+      List<Item>   all_fields;
+
+      bzero((char*) &tables,sizeof(tables));
+      tables.table = table;
+
+      table->io_cache = (IO_CACHE *) my_malloc(sizeof(IO_CACHE),
+                                               MYF(MY_FAE | MY_ZEROFILL));
+      if (setup_order(thd, &tables, fields, all_fields, order) ||
+          !(sortorder=make_unireg_sortorder(order, &length)) ||
+          (table->found_records = filesort(&table, sortorder, length,
+                                           (SQL_SELECT *) 0, 0L, HA_POS_ERROR))
+          == HA_POS_ERROR)
+      {
+	delete select;
+	table->time_stamp=save_time_stamp;	// Restore timestamp pointer
+	DBUG_RETURN(-1);
+      }
+    }
+
     init_read_record(&info,thd,table,select,0,1);
     thd->proc_info="searching";
 
@@ -180,7 +210,7 @@ int mysql_update(THD *thd,TABLE_LIST *table_list,List<Item> &fields,
       }
       else
       {
-	if (!(test_flags & 512))		/* For debugging */	  
+	if (!(test_flags & 512))		/* For debugging */
 	{
 	  DBUG_DUMP("record",(char*) table->record[0],table->reclength);
 	}
@@ -202,7 +232,7 @@ int mysql_update(THD *thd,TABLE_LIST *table_list,List<Item> &fields,
       select->cond=0;
     }
     else
-    {      
+    {
       select= new SQL_SELECT;
       select->head=table;
     }
@@ -213,7 +243,7 @@ int mysql_update(THD *thd,TABLE_LIST *table_list,List<Item> &fields,
     {
       delete select;
       table->time_stamp=save_time_stamp;	// Restore timestamp pointer
-      DBUG_RETURN(-1);	
+      DBUG_RETURN(-1);
     }
   }