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

into fred.bitbike.com:/home/arjen/mysql-4.0

Docs/mirrors.texi

@@ -265,6 +265,10 @@ FTP (@uref{ftp://mysql.unam.mx/pub/mysql/})
 @image{Flags/usa} USA [adgrafix.com / Boston, MA] @@
 WWW (@uref{http://mysql.adgrafix.com/})
 
+@item
+@image{Flags/usa} USA [Argonne National Laboratory / Chicago, IL] @@
+FTP (@uref{ftp://mirror.mcs.anl.gov/pub/mysql/})
+
 @item
 @image{Flags/usa} USA [Hurricane Electric / San Jose, CA] @@
 WWW (@uref{http://mysql.he.net/})
@@ -385,6 +389,10 @@ WWW (@uref{http://mysql.holywar.net/})
 @image{Flags/south-korea} South Korea [Webiiz] @@
 WWW (@uref{http://mysql.webiiz.com/})
 
+@item
+@image{Flags/taiwan} Taiwan [I-SHOU University] @@
+WWW (@uref{http://mysql.isu.edu.tw})
+
 @item
 @image{Flags/taiwan} Taiwan [nctu.edu/HsinChu] @@
 WWW (@uref{http://mysql.nctu.edu.tw/})
@@ -399,6 +407,10 @@ WWW (@uref{http://mysql.ttn.net/})
 
 @itemize @bullet
 
+@item
+@image{Flags/australia} Australia [InterActive Consulting] @@
+WWW (@uref{http://mysql.oranged.to})
+
 @item
 @image{Flags/australia} Australia [planetmirror.com] @@
 WWW (@uref{http://mysql.planetmirror.com/})

sql/sql_update.cc

@@ -521,10 +521,10 @@ multi_update::initialize_tables(JOIN *join)
     if (tab->table->map & tables_to_update_from)
     {
        We are going to update from this table 
-      walk->table=tab->table;
-      walk=walk->next;
-      if (tab == join->join_tab)
-	tab->table->no_keyread=1;
+       TABLE *tbl=walk->table=tab->table;
+       Don't use KEYREAD optimization on this table 
+       tbl->no_keyread=1;
+       walk=walk->next;
     }
   }
 */