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, 36 insertions, 5 deletions

diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index c20a656c547..c00389296ae 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -119,8 +119,13 @@ int generate_table(THD *thd, TABLE_LIST *table_list, TABLE *locked_table)
 }
 
 
-int mysql_delete(THD *thd,TABLE_LIST *table_list,COND *conds,ha_rows limit,
-		 thr_lock_type lock_type, ulong options)
+int mysql_delete(THD *thd,
+                 TABLE_LIST *table_list,
+                 COND *conds,
+                 ORDER *order,
+                 ha_rows limit,
+		 thr_lock_type lock_type,
+                 ulong options)
 {
   int		error;
   TABLE		*table;
@@ -191,8 +196,33 @@ int mysql_delete(THD *thd,TABLE_LIST *table_list,COND *conds,ha_rows limit,
   }
   (void) table->file->extra(HA_EXTRA_NO_READCHECK);
   if (options & OPTION_QUICK)
-    (void) table->file->extra(HA_EXTRA_QUICK);    
-  init_read_record(&info,thd,table,select,-1,1);
+    (void) table->file->extra(HA_EXTRA_QUICK);
+
+  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;
+      DBUG_RETURN(-1);		// This will force out message
+    }
+  }
+
+  init_read_record(&info,thd,table,select,1,1);
   ulong deleted=0L;
   thd->proc_info="updating";
   while (!(error=info.read_record(&info)) && !thd->killed)
@@ -218,9 +248,10 @@ int mysql_delete(THD *thd,TABLE_LIST *table_list,COND *conds,ha_rows limit,
   }
   thd->proc_info="end";
   end_read_record(&info);
+  /* if (order) free_io_cache(table); */ /* QQ Should not be needed */
   (void) table->file->extra(HA_EXTRA_READCHECK);
   if (options & OPTION_QUICK)
-    (void) table->file->extra(HA_EXTRA_NORMAL);    
+    (void) table->file->extra(HA_EXTRA_NORMAL);
   using_transactions=table->file->has_transactions();
   if (deleted && (error <= 0 || !using_transactions))
   {