into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0

into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
(2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).


configure.in:
  Auto merged
mysql-test/r/ndb_charset.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysys/base64.c:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/ndb/include/kernel/AttributeDescriptor.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/tools/ndb_size.pl:
  Auto merged
storage/ndb/tools/ndb_size.tmpl:
  Auto merged
mysql-test/t/disabled.def:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  used "ul", Pekka said he'll fix
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  used "ul", Pekka said he'll fix

password": additional fix, also make sure that a syntax error is 
returned for set names="foo" when there is no such variable or no
stored procedure.


mysql-test/r/sp-error.result:
  Test results fixed: a new test for Bug#13510
mysql-test/t/sp-error.test:
  A new test for Bug#13510 (set names out of an SP)
sql/sql_yacc.yy:
  Bug#13510: fix the case when there is no stored procedure or
  no 'names' variable declared. Return a syntax error in this case.

a UNION in which case returns BLOB". The bug is not present anymore.


mysql-test/r/func_gconcat.result:
  Bug#8568: test results
mysql-test/t/func_gconcat.test:
  Add a test case for Bug#8568

sql/share/errmsg.txt:
  fix after merge
sql/sql_show.cc:
  fix after merge

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

into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)


BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  merge
mysql-test/r/ps_1general.result:
  merge ("ul", will fix)
sql/examples/ha_tina.cc:
  merge
sql/ha_innodb.cc:
  merge
sql/handler.h:
  merge
sql/log.cc:
  merge
sql/set_var.cc:
  merge
sql/share/errmsg.txt:
  merge (bad, will fix)
sql/sql_show.cc:
  merge (bad, will fix)
sql/sql_yacc.yy:
  merge
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  merge

when COUNT(*) is 0". The bug itself cannot be repeated.


mysql-test/r/sp.result:
  Test results were fixed (Bug#14845)
mysql-test/t/sp.test:
  An SQL language test case for Bug#14845
tests/mysql_client_test.c:
  A test case for Bug#14845

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


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

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

mysql-test/r/show_check.result:
  Test fix results.

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

Note: This change was reviewed by Brian before the commit.


mysql-test/r/show_check.result:
  Updated result file
sql/authors.h:
  Added QA team to the file

storage/ndb/src/kernel/vm/LinearPool.hpp:
  wl#1497 LinearPool seize_index
storage/ndb/src/kernel/vm/testSuperPool.cpp:
  wl#1497 LinearPool seize_index

sql/sql_view.cc:
  Auto merged

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

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

The code was reading a HASH or DYNAMIC_ARRAY which may be uninited (difference from 5.0
is that those vars were always zeroed in 5.0 because were static globals, while they are new'd in 5.1).


sql/rpl_filter.cc:
  the hash or dynamic_array may not be inited, depends on a bool (e.g. if wild_do_table_inited==0
  wild_do_table is uninitialized memory); the code was not taking the bool into account and so reading uninited memory.
sql/rpl_filter.h:
  comments and prototype change (see rpl_filter.cc)

  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.

into lmy004.:/work/mysql-5.1-bdb_region


sql/mysqld.cc:
  Auto merged

sql/mysqld.cc:
  reorder
sql/set_var.cc:
  reorder

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:/home/jimw/my/mysql-5.1-clean


sql/ha_berkeley.cc:
  Auto merged

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.