without the PS protocol

  s/spaces/TAB/

  Add running of test suite with --ps-protocol to 'test' target

into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/wl2274.2

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean

  quick fix for wrong allocation of size

into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean

changed back to just restricting max meta objects in dict to make sure we can "always" configure ourselves out of unforseen limits

into sanja.is.com.ua:/home/bell/mysql/bk/work-ref-4.1

  UPDATE clause conflicts with SELECT for use of item_list field.
  Alter UPDATE clause to use new lex field update_list
  Tests included

+ fixed testcase

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean

  changed help text

    added start backup parameter to enable setting wait state
    and set different timeouts depending on waitstate
    moved listen of backup event out of backup and into separete thread
    thread created at connect() and destroyed at disconnect()
    added start backup command options "nowait" "wait completed" "wait started"
    fixed log level settings

into sanja.is.com.ua:/home/bell/mysql/bk/work-ref-4.1

refernces if subqueri is not in HAVING clause (BUG#7079)
  and the same used for subquery transformetion

  Call mark_as_null_row in join_read_const and join_read_system.

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into hundin.mysql.fi:/home/marko/k/mysql-4.1

into hundin.mysql.fi:/home/marko/k/mysql-4.0

into gw.mysql.r18.ru:/usr/home/ram/work/4.1

  Remove accidentally pushed unnecessary change

       bug #7126: Test failure: 'func_str' when using '--ps-protocol'
       bug #7130: Test failure: 'type_uint' when using '--ps-protocol').

  Remove accidentally merged 4.0 changes
dict0dict.c:
  Remove the 4.0 fix accidentally auto-merged to 4.1
row0mysql.h, dict0dict.h:
  Remove a change auto-merged from 4.0

  Fix for the 0xA0 character problem in the InnoDB FOREIGN KEY parser: if my_isspace() treats 0xA0 as space, then let InnoDB do the same; this might break some multi-byte charset id's, though for big5, ujis, sjis this seems not to change the current behavior (I checked the tables in /share/charsets); this fix must NOT be merged to 4.1 because in 4.1 everything is in UTF-8