mysql-test/r/innodb.result:
  After merge fix.
  Test for bug 11816 has four more inserts.

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


myisam/mi_search.c:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/innodb.result:
  Hand merged.
mysql-test/r/key.result:
  Hand merged.
mysql-test/r/myisam.result:
  Hand merged.
mysql-test/t/key.test:
  Hand merged.
mysql-test/t/myisam.test:
  Hand merged.
sql/sql_delete.cc:
  Hand merged.
sql/sql_parse.cc:
  Hand merged.

Added a switch to reject illegal values for PACK_KEYS.


mysql-test/r/myisam.result:
  Bug#10056 - PACK_KEYS option take values greater than 1 while creating table
  The test result.
mysql-test/t/myisam.test:
  Bug#10056 - PACK_KEYS option take values greater than 1 while creating table
  The test case.

Skipping deleted records instead of breaking the loop
during checksum calculation.


mysql-test/r/myisam.result:
  Bug#12296 - CHECKSUM TABLE reports 0 for the table
  The test result.
mysql-test/t/myisam.test:
  Bug#12296 - CHECKSUM TABLE reports 0 for the table
  The test case.

Handle temporary tables like permanent tables: If the storage engine
cannot truncate, delete instead.


mysql-test/r/innodb.result:
  Bug#11816 - Truncate table doesn't work with temporary innodb tables
  The test result.
mysql-test/t/innodb.test:
  Bug#11816 - Truncate table doesn't work with temporary innodb tables
  The test case.
sql/sql_delete.cc:
  Bug#11816 - Truncate table doesn't work with temporary innodb tables
  Handle temporary tables like permanent tables: If the storage engine
  cannot truncate, delete instead.
  Replaced a numeric literal by its symbolic name.

Supplied the default database name for ALTER TABLE ... RENAME 
for the new table instead of the old tables db like we do for 
other ALTERs.


mysql-test/r/alter_table.result:
  Bug#11493 - Alter table rename to default database does not work without db name qualifying
  The test result.
mysql-test/t/alter_table.test:
  Bug#11493 - Alter table rename to default database does not work without db name qualifying
  The test case.

Changed end-space comparison so that the key is not used past
its end. This is due to the new end-space behaviour in 4.1.
See also bug 6151 and 9188.


mysql-test/r/key.result:
  Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table
  The test result.
mysql-test/t/key.test:
  Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table
  The test case.

mysql-test/r/gis.result:
  result fixed
mysql-test/t/gis.test:
  test corrected

into deer.(none):/home/hf/work/mysql-5.0.clean


sql/sql_yacc.yy:
  Auto merged

sql/sql_yacc.yy:
  exact types specified for opt_var_type and similar

into deer.(none):/home/hf/work/mysql-5.0.clean


sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into deer.(none):/home/hf/work/mysql-5.0.clean


myisam/mi_check.c:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/t/gis-rtree.test:
  Auto merged

into deer.(none):/home/hf/work/mysql-4.1.clean

(already approved)


mysql-test/r/information_schema.result:
  update test results
mysql-test/r/sp.result:
  update test results
mysql-test/r/sql_mode.result:
  update test results
sql/sp.cc:
  don qualify the name

into lmy004.:/work/mysql-5.0-bug11904


sql/sql_select.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

into  xiphis.org:/usr/home/antony/work2/p3-bug9048.2

  "Creating a function with char binary IN parameter fails"
  Parse BINARY as part of type declaration, not as 
  a column attribute.


mysql-test/r/sp.result:
  test for bug 9048
mysql-test/t/sp.test:
  test for bug 9048
sql/sql_yacc.yy:
  fix bug 9048
  parse BINARY as part of type declaration and not as column modifier.

into mysql.com:/Users/kent/mysql/bk/mysql-5.0

  Max index key length increased from 1024 to 3072
  for 64 bit builds.


sql/unireg.h:
  Max index key length increased from 1024 to 3072
  for 64 bit builds.

No commit message

into mysql.com:/home/psergey/mysql-5.0-rpl-bug

  Simplified and corrected mtr_timer_stop_all()


mysql-test/lib/mtr_timer.pl:
  Simplified and corrected mtr_timer_stop_all()

into mysql.com:/home/psergey/mysql-5.0-rpl-bug


sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged

sql/item.cc:
  Code cleanup
sql/item.h:
  Code cleanup
sql/log.cc:
  Added comments
sql/sp_head.cc:
  Code cleanup patch from Monty: 
  in subst_spvars()
  - Move local variables first in block
  - Use res|= instead of res |=
  - Use strmake() instead of alloc + memcpy
  Added:
  - Fail the query if we don't have enough memory to produce a binlog-suitable query string: 
    if we're so low on memory we're likely to fail the query anyway, and failing now removes
    the need for hack with THD::query_str_binlog_suitable.
sql/sql_class.cc:
  Remove THD::query_str_binlog_unsuitable
sql/sql_class.h:
  Remove THD::query_str_binlog_unsuitable
sql/sql_delete.cc:
  Remove THD::query_str_binlog_unsuitable
sql/sql_insert.cc:
  Remove THD::query_str_binlog_unsuitable
sql/sql_parse.cc:
  Code cleanup
sql/sql_update.cc:
  Remove THD::query_str_binlog_unsuitable

into  radha.local:/Users/patg/mysql-build/mysql-5.0.clean


sql/ha_blackhole.cc:
  Resolve of fixed typo application to both 4.1 and 5.0

sql/ha_blackhole.cc:
  Typo to DBUG_RETURN fixed

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0

into mysql.com:/Users/kent/mysql/bk/mysql-5.0

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0


BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f:
  Auto merged
BitKeeper/etc/config:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
include/help_end.h:
  Auto merged
include/help_start.h:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamlog.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysql_test_run.c:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqld_safe.c:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/mysqlshow.def:
  Auto merged
sql/ha_blackhole.cc:
  Auto merged
sql/ha_blackhole.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
client/client_priv.h:
  Merged from 4.1
client/mysqladmin.cc:
  Merged from 4.1
client/mysqlbinlog.cc:
  Merged from 4.1
mysys/charset.c:
  Merged from 4.1

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


configure.in:
  Auto merged
sql/sp_head.cc:
  Auto merged

  Corrected typo


mysql-test/lib/mtr_report.pl:
  Corrected typo
mysql-test/mysql-test-run.sh:
  Corrected typo

mysys/my_alloc.c:
  Auto merged
sql/sql_table.cc:
  Auto merged

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0


sql/sql_show.cc:
  Auto merged

sql/sql_select.cc:
  reset the group functions and copy the values of the first row before exiting because of
  maximal number of rows has been read for this cursor fetch. the additional variable is needed
  to save code duplication.
tests/mysql_client_test.c:
  test for bug #11904 (cursor grouping wrong result)

into  radha.local:/Users/patg/mysql-build/mysql-4.1

sql/ha_blackhole.cc:
  Blackhole Lock changes to blackhole per Brian, reapplied
sql/ha_blackhole.h:
  blackhold lock changes added per brian

  Changed spelling "Commerical" to "Commercial"
mysqld.vcproj:
  Aligned engines with Unix version
sql_class.cc:
  VC7 needs my_free() cast of first arg to be (gptr)
my_global.h:
  Can't assume macro set_timespec_nsec exists if set_timespec does


include/my_global.h:
  Can't assume macro set_timespec_nsec exists if set_timespec does
sql/sql_class.cc:
  VC7 needs my_free() cast of first arg to be (gptr)
VC++Files/sql/mysqld.vcproj:
  Aligned engines with Unix version
VC++Files/libmysqld/libmysqld.vcproj:
  Changed spelling "Commerical" to "Commercial"