First one is related to Bug#7905. One should not be allowed to
create new user with password without UPDATE privilege to
MySQL database. Furthermore, executing the same GRANT statement
twice would actually crash the server and corrupt privilege database.

Other bug was that one could update a column, using the existing
value as basis to calculate the new value (e.g. UPDATE t1 SET a=a+1)
without SELECT privilege to the field (a in the above example)

Fixed tests grant.pl and grant2, which were wrong.

Enabled VARCHAR testing for innodb

NOTE: innodb.test currently fails becasue of a bug in InnoDB. 
I have informed Heikki about this and expect him to fix this ASAP

into mysql.com:/home/my/mysql-5.0

into krsna.:/home/patg/test/mysql-5.0

WL#874 "Extended LOAD DATA" was pushed.

into krsna.:/home/patg/test/mysql-5.0

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.3

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.3

  Allow also long VARCHARs to be stored externally, not just BLOBs; fixes a bug reported by Trudy Pelzer; needs more testing

into krsna.:/home/patg/test/mysql-5.0

into mysql.com:/home/dlenev/src/mysql-5.0-eld-exp

Removed some optional arguments
Fixed portability problem in federated tests

into mysql.com:/home/dlenev/src/mysql-5.0-eld-exp

  Update key lengths in EXPLAIN to reflect true VARCHARs

  Fix bug: InnoDB created all indexes on true VARCHARs as column prefix keys because field->pack_length() for a true VARCHAR is bigger than key_part->length; FOREIGN KEYs could not be created on true VARCHARs then

  Fix a crash in a simple search with a key: the dtype->len of a true VARCHAR is the payload maximum len in bytes: it does not include the 2 bytes MySQL uses to store the string length
ha_innodb.cc:
  Fix a crash in true VARCHARs in test-innodb: we passed a wrong pointer to the column conversion in an UPDATE
rowid_order_innodb.result, ps_3innodb.result, innodb.result, endspace.result:
  Edit InnoDB test results to reflect the arrival of true VARCHARs

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into mysql.com:/home/my/mysql-5.0

DATA_VARMYSQL so remove unnecessary condition.

The idea is to use TABLE_LIST::lock_type for passing type of lock for
target table to mysql_load() instead of using LEX::lock_option 
(which were rewritten by first subselect in SET clause).

This should also fix potential problem with LOAD DATA in SP
(it is important for them to have right lock_type in the table
 list by the end of statement parsing).

  Check that there is a disabled.def before using it
disabled.def:
  Reenable ndb tests accidently disabled

  calc_row_difference(): Use non-inlined functions to avoid linking error.

into lmy002.wdf.sap.corp:/home/georg/work/mysql/sap/mysql-5.0

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

Changes to a test with a update to a table with 1001 columns, the last being a blob. 
On HP, the test worked properly, but on other OSs, there's a problem with using the 
blob column in an update where clause. The field method val_string(String *, char *) 
should work, but doesn't seem to deal with blobd, and for some reason, cannot get
the correct value of the blob column from the byte pointer in update_row, "*old_data"
which is a byte pointer to the row in mysql format, that will be replaced with 
"*new_data" (which conveniently has a field pointer to use to get values from).

Will document this.

Edits to ha_federated.cc per Monty, cleanup

Now one can use user variables as target for data loaded from file
(besides table's columns). Also LOAD DATA got new SET-clause in which
one can specify values for table columns as expressions.

For example the following is possible:
LOAD DATA INFILE 'words.dat' INTO TABLE t1 (a, @b) SET c = @b + 1;

This patch also implements new way of replicating LOAD DATA.
Now we do it similarly to other queries.
We store LOAD DATA query in new Execute_load_query event
(which is last in the sequence of events representing LOAD DATA).
When we are executing this event we simply rewrite part of query which
holds name of file (we use name of temporary file) and then execute it
as usual query. In the beggining of this sequence we use Begin_load_query
event which is almost identical to Append_file event

  Rework to resolve ambigious grammer: conflict in join expression
  handling of parentheses for nested joins and derived tables.
  Tests included of failing statements
Optimize item construction for AND/OR logical expressions

into mysql.com:/home/my/mysql-5.0

  InnoDB true VARCHAR

into mdk10.(none):/home/reggie/bk/mysql-5.0

into mdk10.(none):/home/reggie/bk/mysql-5.0

sql_show.cc:
  changed strdup to thd->memdup per Serg's advice

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1