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

Enabled view tests that didn't work before.


mysql-test/r/view.result:
  Enabled natural outer join tests with views - now they work after WL#2486 was pushed.
mysql-test/t/view.test:
  Enabled natural outer join tests with views - now they work after WL#2486 was pushed.

mysql-test/r/mix_innodb_myisam_binlog.result:
  update results
mysql-test/t/mix_innodb_myisam_binlog.test:
  Update binlog test

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


client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/r/mix_innodb_myisam_binlog.result:
  Resolve conflict
sql/item_func.cc:
  Resolve conflict
sql/sql_show.cc:
  Resolve conflicts

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

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


configure.in:
  Auto merged

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

sql/sql_prepare.cc:
  Post-review fixes (Bug#13524): make sure 
  mysql_reset_thd_for_next_command is called first for
  all PS commands.

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

  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


sql/ha_innodb.cc:
  BUG#12701: SHOW VARIABLES does not show correct size of buffer pool
sql/ha_innodb.h:
  BUG#12701: SHOW VARIABLES does not show correct size of buffer pool.
sql/mysqld.cc:
  BUG#12701: SHOW VARIABLES does not show correct size of buffer pool.
sql/set_var.cc:
  BUG#12701: SHOW VARIABLES does not show correct size of buffer pool.

incorrect warning on open cursor"


sql/sql_prepare.cc:
  A fix for Bug#13524 "lock timeout gives incorrect 
  warning on open cursor": reset the connection for next
  command before performing a cursor fetch (add an omitted line).
tests/mysql_client_test.c:
  A test case for Bug#13524 "lock timeout gives 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".


mysql-test/r/sp-error.result:
  Added test for bug #12329 "Bogus error msg when executing PS with stored
  procedure after SP was re-created".
mysql-test/r/trigger.result:
  Added test for bug #13399 Crash when executing PS/SP which should activate
  trigger which is now dropped".
mysql-test/t/sp-error.test:
  Added test for bug #12329 "Bogus error msg when executing PS with stored
  procedure after SP was re-created".
mysql-test/t/trigger.test:
  Added test for bug #13399 Crash when executing PS/SP which should activate
  trigger which is now dropped".
sql/sp_head.cc:
  sp_head::add_used_tables_to_table_list():
    We have to copy database/table names and alias to PS/SP memory since current
    instance of sp_head object can pass away before next execution of PS/SP for
    which tables are added to prelocking list.
    This will be fixed by introducing of proper invalidation mechanism once new
    TDC is ready.

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


mysql-test/r/rpl_sp.result:
  Test results were fixed (Bug#14077).
mysql-test/t/rpl_sp.test:
  Add a test case for Bug#14077 "Failure to replicate a stored 
  function with a cursor".
sql/sql_parse.cc:
  Do not rewrite SELECTs with DOs on slave: if this SELECT was for a stored
  routine cursor, slave must be able to execute the SELECT in order to
  open a cursor.
  At the moment the bug is present only in stored functions and stored
  procedures called from stored functions, because, due to
  stored procedure unfolding for replication, top level stored procedures
  are never executed 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.

mysql-test/t/func_group.test:
  re-enable the test

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

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

mysql-test/r/ndb_charset.result:
  bug#14007 5.0
mysql-test/t/ndb_charset.test:
  bug#14007 5.0
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  bug#14007 5.0
ndb/src/kernel/vm/SimulatedBlock.cpp:
  bug#14007 5.0
ndb/src/kernel/vm/SimulatedBlock.hpp:
  bug#14007 5.0

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.


mysql-test/r/sp-error.result:
  Test that statements which implicitly commit transaction
mysql-test/t/sp-error.test:
  Test that statements which implicitly commit transaction
sql/sp_head.cc:
  We set the new flag about commit/rollback statements presence
sql/sp_head.h:
  The new flag about commit/rollback presence added
  A comment fixed
sql/sql_yacc.yy:
  Removed commit/rollback-statement-present errors spread by this file, only one check left which check flags of a SP

  Auto merged


ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged

mysql-test/r/ndb_charset.result:
  bug#14007 test [re-commit]
mysql-test/t/ndb_charset.test:
  bug#14007 test [re-commit]
ndb/include/kernel/AttributeDescriptor.hpp:
  bug#14007 4.1 need getSizeInBytes [re-commit]
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  bug#14007 4.1 *** do not AUTOmerge to 5.0 *** [re-commit]

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


mysql-test/r/handler.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/mysql_priv.h:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.
sql/sql_base.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.
sql/sql_handler.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.
sql/sql_table.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.

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.


ndb/tools/ndb_size.pl:
  Computer minimum parameter settings (MaxNoOfTables, Attributes, Indexes, Triggers) and the memory usage because of these settings.
ndb/tools/ndb_size.tmpl:
  display parameters

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


ndb/tools/ndb_size.pl:
  Provide --help and --usage.
  
  Fix some bugs related to quoting table names.
ndb/tools/ndb_size.tmpl:
  A NAME and A HREF to tables from the main list

mysql-test/r/view.result:
  SCCS merged
mysql-test/t/view.test:
  SCCS merged

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".


include/my_pthread.h:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Added a new macro for the 5.0 addendum fix.
mysql-test/r/handler.result:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  The test result.
mysql-test/t/handler.test:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  The test case.
sql/lock.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Changed a comment which did confuse me and which is not fully
  correct anymore after the 5.0 addendum fix.
  Added an assertion which would fire without the 5.0 addendum fix.
sql/mysql_priv.h:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Changed a definition for the secondary fix.
sql/sql_base.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Changed function calls for the secondary fix.
sql/sql_class.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Changed a function call for the secondary fix.
sql/sql_handler.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  The first two diffs make the primary bug fix.
  The rest is for the secondary fix.
sql/sql_table.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  The first diff (four changed places) make the 5.0 addendum fix.
  The other three are changed function calls for the secondary fix.

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

BitKeeper/deleted/.del-rpl_bug7947.result~1b40af7545a6c692:
  Delete: mysql-test/r/rpl_bug7947.result
BitKeeper/deleted/.del-rpl_bug7947.test~20613cfdc560a16c:
  Delete: mysql-test/t/rpl_bug7947.test

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0

into moonbone.local:/work/14850-bug-5.0-mysql

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0


myisam/ft_parser.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged