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

+ 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

  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

  In the FOREIGN KEY parser, do not cut 0xC2A0 from the end of an identifier if it was quoted

to reuse test results for both server and --embedded-server
versions.

  Use different TESTS_BINDIR for --embedded-server

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-patches

Allow to insert not-assigned UJIS codes. 

  Moved "../regex/libregex.a" before "../libmysql/libmysqlclient.la"
  when linking. For -all-static linking libtool put -lc after the .la
  file and this put the libc regex functions before our regex functions
  when linking on Linux.

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

(after discussion with SerG)

  Fix the bug that the character 0xA0 that EMS MySQL Manager in ALTER TABLE adds after a table name confuses the InnoDB FOREIGN KEY parser, causing an error 121 when we try to add a new constraint; a full fix would require the lexer to be aware of thd->charset_info() and UTF-8

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

expression involving LEFT() function is used in GROUP BY
field.

  srv_printf_innodb_monitor(): Removed extraneous rewind() call.
  The caller of this function calls rewind() if necessary.
  In this way, we avoid rewind()ing stderr in
  srv_lock_timeout_and_monitor_thread().

  Added --with-csv and --with-example for CSV and Example storage engines

into mysql.com:/home/jonas/src/mysql-4.1

  created by 4.1.7 as bugfix changed binary format