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

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

Enabled view tests that didn't work before.

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

into  mysql.com:/home/jimw/my/mysql-4.1-clean

into  mysql.com:/home/jimw/my/mysql-4.1-clean

into  mysql.com:/home/jimw/my/mysql-4.1-clean

into  mysql.com:/opt/local/work/mysql-5.0-13524

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

  BUG#12701: SHOW VARIABLES does not show correct size of buffer pool.
ha_innodb.cc:
  BUG#12701: SHOW VARIABLES does not show correct size of buffer pool

incorrect warning on open cursor"

into production.mysql.com:/usersnfs/istruewing/autopush/mysql-4.1

into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947

into  mysql.com:/home/dlenev/src/mysql-5.0-bg13399-2

which is now dropped" and bug #12329 "Bogus error msg when executing PS with
stored procedure after SP was re-created".

function with a cursor". Enable execution of SELECT queries in SP on slave.

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

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

into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0

into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0

After merge fix.

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

into  mysql.com:/export/space/pekka/ndb/version/my41-r1.2456.1.1

Issuing error about presence of commit/rollback statements in stored functions and triggers added to SP parsing procedure (BUG#13627)

The crash mentioned in original bug report is already prevented by one
of previous patches (fix for bug #13343 "CREATE|etc TRIGGER|VIEW|USER
don't commit the transaction (inconsistency)"), this patch only improve
error returning.

  Auto merged

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

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

Add display of minimum requirements for various cluster parameters
e.g. DataMemory, IndexMemory, MaxNoOfTables, MaxNoOfAttributes etc

and the memory usage because of them.

fix some small bugs, slightly improve output, add --help

Version for 5.0.
It fixes three problems:
1. The cause of the bug was that we did not check the table version for
 the HANDLER ... READ commands. We did not notice when a table was
 replaced by a new one. This can happen during ALTER TABLE, REPAIR
 TABLE, and OPTIMIZE TABLE (there might be more cases). I call the fix
 for this problem "the primary bug fix".
2. mysql_ha_flush() was not always called with a locked LOCK_open.
 Though the function comment clearly said it must.
 I changed the code so that the locking is done when required. I call
 the fix for this problem "the secondary fix".
3. In 5.0 (not in 4.1 or 4.0) DROP TABLE had a possible deadlock flaw in
 concur with FLUSH TABLES WITH READ LOCK. I call the fix for this
 problem "the 5.0 addendum fix".

into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947