into moonbone.local:/work/14583-bug-5.1-new-mysql

into moonbone.local:/work/14583-bug-4.1-mysql

Manual merge.

into  mysql.com:/home/mydev/mysql-5.0-bug5390

into  mysql.com:/home/stewart/Documents/MySQL/5.1/new

into  xiphis.org:/home/antony/work2/p4-bug15976

into  mysql.com:/home/mydev/mysql-5.0-bug5390

into  mysql.com:/space/pekka/ndb/version/my50

into  mysql.com:/space/pekka/ndb/version/my51

When InnoDB compares varchar field in ucs2 with given key using bin collation,
it calls my_strnncollsp_ucs2_bin() to perform comparison.
Because field length was lesser than length of key field should be padded
with trailing spaces in order to get correct result. 
Because  my_strnncollsp_ucs2_bin() was calling my_strnncollp_ucs2_bin(), which
doesn't pads field, wrong comparison result was returned. This results in
wrong result set.

my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
but using binary collation.

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main

into  mysql.com:/home/mydev/mysql-4.1-bug5390

into  mysql.com:/home/mydev/mysql-5.0-bug5390

into  mysql.com:/home/mydev/mysql-5.1-bug5390

into  mysql.com:/home/mydev/mysql-5.1-bug5390

into  pylon.mylan:/home/psergey/mysql-5.1-26dec-merge

into  mysql.com:/home/psergey/mysql-5.1-26dec-merge

into  pylon.mylan:/home/psergey/mysql-5.1-26dec-merge

into  mysql.com:/home/mydev/mysql-5.1-bug5390

into  mysql.com:/home/mydev/mysql-5.0-bug5390

  added item_xmlfunc.cc

  Delete: libmysqld/item_xmlfunc.cc

adjust SEL_TREE::keys_map appropriately.

- Added more comments.
- Added a RANGE_OPT_PARAM::remove_jump_scans flag that disables construction of index_merge
  SEL_TREEs that represent unusable conditions like "key1part1<c1 OR key2part2<c2"
- make prune_partitions() function handle the case where range analysis produces a list of 
  index_merge trees (it turned out that this is possible, appropriate test case added).
- Other small fixes.

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

  leaks caused by Archive storage engine not closing files and
  storage engines not receiving panic() during shutdown

--engine="myisam,archive"

--number-of-rows has been removed for the time being and replaced with
 option to allow you to just repeat multiple time all of the inserts you specifed with data. When number-of-rows-returns it will be instead used for averaging rows while growing concurrency. 

Returned stats now has accurent row and query counts since it includes a multiple for the rows and queries added.

Parser is now a touch smarter and understands end of file issues if you have a delimiter at the end of the file.  

into  zim.(none):/home/brian/mysql/cluster-5.1

1) Parsing now works
2) Options are safer, aka it doesn't kill the machine and it cleans up after itself
3) Option of --only-print added so that you can see what it does.
4) Tiny cleanup of the auto generate sql. A lot more needs to be done with this, for it to be very valuable. I suspect it doesn't work all that well.
5) Delimeter is now a single character. No good escaping going on.
6) You can now change which schema it is runninng against.

Now I think I can go make use of it! 

Though I need to add support for a "only run this many inserts, divide by the number of clients connecting, to really test scaling"