Make list of tags/name/values to simplify adding more tags
Check if debug compiled binaries


mysql-test/lib/mtr_cases.pl:
  Fix warnings
  Use local file handle for recursive "include file" loop
  Make list of tags/name/value to search for in .test files
  Add fileter for "require debug compiled binary"
mysql-test/lib/mtr_process.pl:
  Fix warnings
mysql-test/lib/mtr_report.pl:
  Fix warning, only print total time if "--timer"
mysql-test/mysql-test-run.pl:
  Fix warnings
  Add check of debug compiled binaries

Check for big-test, ndb-extra, require_manager and binlog format row/stmt 

Change 'mtr_kill_process' to only take three arguments. The last indicating max number of seconds to wait for process to be killed.
Leave it to the implementation of 'mtr_kill_process' how long to wait between each attempt to kill/detect if process has been killed.


mysql-test/lib/mtr_process.pl:
  Change 'mtr_kill_process' to only take three arguments. The last indicating max number of seconds to wait for process to be killed.
mysql-test/mysql-test-run.pl:
  Change 'mtr_kill_process' to only take three arguments. The last indicating max number of seconds to wait for process to be killed.

Add comment why test is skipped


mysql-test/lib/mtr_cases.pl:
  Add comments why tets is skipped
  Disable the use of --skip-innodb if test does not need it
mysql-test/lib/mtr_report.pl:
  Print commment why test was skipped

Fix merge problem


mysql-test/r/join_outer_innodb.result:
  Update test result
mysql-test/t/group_min_max.test:
  Add missing drop table (lost during merge)

Cacluate nodeid and ndb_fs path when initializing ndbds, to be used when defining log files and when removing the ndb_fs after failed test case

Use function 'stop_all_servers' to stop the running servers before restoring snapshot and resuming tests

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


BUILD/compile-dist:
  Auto merged
client/mysqltest.c:
  Auto merged
config/ac-macros/ssl.m4:
  Auto merged
include/config-win.h:
  Auto merged
include/my_base.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/group_min_max.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/rpl_insert_id_pk.result:
  Auto merged
mysql-test/r/rpl_ndb_multi_update3.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/r/rpl_ndb_sp006.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/my_clock.c:
  Auto merged
mysys/my_copy.c:
  Auto merged
mysys/my_create.c:
  Auto merged
mysys/my_dup.c:
  Auto merged
mysys/my_lib.c:
  Auto merged
mysys/my_open.c:
  Auto merged
mysys/my_redel.c:
  Auto merged
mysql-test/r/create.result:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/r/join_outer.result:
  Manual merge
mysql-test/t/func_group.test:
  Manual merge
mysql-test/t/group_min_max.test:
  Manual merge
mysql-test/t/innodb_mysql.test:
  Manual merge

mysql-test/r/rpl_loaddata.result:
  Add missing drop table t1 to result

into  mysql.com:/home/mydev/mysql-5.1-amerge

into  rurik.mysql.com:/home/igor/mysql-5.1

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0

into mysql.com:/home/psergey/mysql-5.1-bug19684


sql/opt_range.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  mysql.com:/home/mydev/mysql-5.1-amerge

into  mysql.com:/home/mydev/mysql-5.1-amerge

sql/log.cc:
  Auto merged
sql/sql_insert.cc:
  SCCS merged

mysql-test/mysql-test-run.pl:
  Auto merged

into  mysql.com:/home/mydev/mysql-5.1-amerge

mysql-test/mysql-test-run.pl:
  Auto merged

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/r/ssl.result:
  Manual merge
mysql-test/r/ssl_compress.result:
  Manual merge

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


BitKeeper/deleted/.del-generate_prefix_files.pl:
  Delete: extra/yassl/include/openssl/generate_prefix_files.pl
BitKeeper/deleted/.del-prefix_crypto.h:
  Delete: extra/yassl/include/openssl/prefix_crypto.h
BitKeeper/deleted/.del-prefix_ssl.h:
  Delete: extra/yassl/include/openssl/prefix_ssl.h
BitKeeper/deleted/.del-Makefile.am~abb265028eb9b6a7:
  Auto merged
BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7:
  Auto merged
BitKeeper/deleted/.del-yassl.m4~e55e55c1e863abaf:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/yassl/include/openssl/crypto.h:
  Auto merged
extra/yassl/include/openssl/ssl.h:
  Auto merged
extra/yassl/include/yassl_int.hpp:
  Auto merged
extra/yassl/src/Makefile.am:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
extra/yassl/src/template_instnt.cpp:
  Auto merged
extra/yassl/src/yassl_int.cpp:
  Auto merged
extra/yassl/testsuite/Makefile.am:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
include/violite.h:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/include/common-tests.inc:
  Auto merged
mysql-test/r/analyze.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/key_cache.result:
  Auto merged
mysql-test/r/preload.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/analyze.test:
  Auto merged
mysql-test/t/explain.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
vio/Makefile.am:
  Auto merged
client/Makefile.am:
  Manual merge
libmysqld/Makefile.am:
  Manual merge
mysql-test/r/compress.result:
  Manual merge
mysql-test/r/explain.result:
  Manual merge
mysql-test/r/select.result:
  Manual merge
mysql-test/r/view.result:
  Manual merge
mysql-test/t/select.test:
  Manual merge
mysql-test/t/view.test:
  Manual merge
sql/sql_base.cc:
  Manual merge
sql/sql_parse.cc:
  Manual merge

mysql-test/mysql-test-run.pl:
  Auto merged

mysql-test/mysql-test-run.pl  :  Output the usage error if one is given. (Found when fixing bug#20303)


mysql-test/mysql-test-run.pl:
  Found when fixing bug#20303: The "usage()" function ignored the message it was given,
  so we got no real indication about the problem. Print it if one is given.

mysql-test/mysql-test-run.pl:
  Auto merged

mysql-test/mysql-test-run.pl  :    A fix for bug#20303 "mysql-test-run.pl: Does not recognize -- argument"


mysql-test/mysql-test-run.pl:
  A fix for bug#20303 "mysql-test-run.pl: Does not recognize -- argument":
  Due to the use of 'pass_through' in option processing this lone '--' will remain
  as an argument, it must be ignored explicitly.

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


include/config-win.h:
  Auto merged
include/my_base.h:
  Auto merged
mysys/my_clock.c:
  Auto merged
mysys/my_copy.c:
  Auto merged
mysys/my_create.c:
  Auto merged
mysys/my_dup.c:
  Auto merged
mysys/my_lib.c:
  Auto merged
mysys/my_open.c:
  Auto merged
mysys/my_redel.c:
  Auto merged
sql/unireg.cc:
  Auto merged

Changed error to be more descriptive when you are refering to a not existing key
Fixed core dump in view test and changed to better error message


BUILD/compile-pentium64-debug-max:
  Added --pipe option for faster compile
  (This changset was missing in the tree I used to rebuild a new 5.1 tree)
BUILD/compile-pentium64-debug:
  Added --pipe option for faster compile
  (This changset was missing in the tree I used to rebuild a new 5.1 tree)
mysql-test/include/common-tests.inc:
  Changed error to be more descriptive
mysql-test/r/compress.result:
  Changed error to be more descriptive
mysql-test/r/explain.result:
  Changed error to be more descriptive
mysql-test/r/key_cache.result:
  Changed error to be more descriptive
mysql-test/r/preload.result:
  Changed error to be more descriptive
mysql-test/r/select.result:
  Changed error to be more descriptive
mysql-test/r/ssl.result:
  Changed error to be more descriptive
mysql-test/r/ssl_compress.result:
  Changed error to be more descriptive
mysql-test/r/view.result:
  Changed error to be more descriptive
mysql-test/t/disabled.def:
  Disable im_instance_conf and im_options  until Bug#20294 (Instance manager test im_instance_conf fails randomly) is fixed
mysql-test/t/explain.test:
  Changed error to be more descriptive
mysql-test/t/select.test:
  Changed error to be more descriptive
mysql-test/t/view.test:
  Changed error to be more descriptive
sql/share/errmsg.txt:
  Fix that ER_KEY_DOES_NOT_EXISTS has same SQLSTATE as ER_KEY_COLUMN_DOES_NOT_EXISTS
sql/sql_base.cc:
  Fixed core dump in view test
  Changed to correct error message that also shows the name of the faulty table
BUILD/compile-pentium64:
  New BitKeeper file ``BUILD/compile-pentium64''

BUG#19544 mysqldump does not backup TS and LG information correctly.
  
Problem was the type of the column was varchar(8) not an integer type. So mysqld
was outputting a string representation of the number in scientific notation,
which wasn't exact. Now we do it as a bigint and output the number in bytes.

Fix assertion when loading plugins due to handler changes



sql/sql_base.cc:
  manual merge (comment by igor)
sql/sql_plugin.cc:
  Fix assertion when loading plugins due to handler changes (By jimw)
sql/sql_show.cc:
  Correct type of I_S.FILES table columns: INITIAL_SIZE, MAXIMUM_SIZE and AUTOEXTEND_SIZE
  so that they really are bigint and not varchar. (By stewart)