into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_load.cc:
  Auto merged

Yet another test result that needed to be regenerated due to new error
messages. This test only runs via ./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row rpl_extraCol_innodb

into  trift2.:/MySQL/M51/spec-5.1


support-files/mysql.spec.sh:
  SCCS merged

    The "mysqlmanager" man page got moved from section 1 to 8.


support-files/mysql.spec.sh:
  The "mysqlmanager" man page got moved from section 1 to 8.

into  trift2.:/MySQL/M50/spec-5.0


support-files/mysql.spec.sh:
  Manual merge.

    The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".


support-files/mysql.spec.sh:
  The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".

mysql_upgrade test gives inconsitent results

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build

Found that the results from select had to be fixed too.

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


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

changed to test verbiage to test PB on 5.1 arch tree

Trying again (!) to commit the fix containing replace-result to fix the problem
with hard-coded ports in the result file of the federated_server test.

Added --replace-result to avoid hard-coding of port

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/sql_class.h:
  Auto merged

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


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

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt


sql/sql_class.h:
  Auto merged

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt

* New result files due to new error message/error numbers
* Fixed system_mysql_db tests to work with servers table
* Added UTF8 charset to table defs


mysql-test/include/system_db_struct.inc:
  WL# 3031
  
  Added servers table to inc file used in system_mysql_db* tests
mysql-test/lib/init_db.sql:
  WL# 3031
  
  Added UTF charset to table def
mysql-test/r/mysql.result:
  WL# 3031
  
  New result files, new error messages shifted error #s up by two
mysql-test/r/rpl_sp.result:
  WL# 3031
  
  New result files, new error messages shifted error #s up by two
mysql-test/r/sp.result:
  WL# 3031
  
  New result files, new error messages shifted error #s up by two
mysql-test/r/sp_gis.result:
  WL# 3031
  
  New result files, new error messages shifted error #s up by two
mysql-test/r/system_mysql_db.result:
  WL #3031
  
  New system_mysql_db tests required adding servers table creation. Some more
  comments in these tests would have been nice to explain what they do ;)
mysql-test/t/system_mysql_db_fix30020.test:
  WL #3031
  
  New system_mysql_db tests required adding servers table creation. Some more
  comments in these tests would have been nice to explain what they do ;)
mysql-test/t/system_mysql_db_fix40123.test:
  WL #3031
  
  New system_mysql_db tests required adding servers table creation. Some more
  comments in these tests would have been nice to explain what they do ;)
mysql-test/t/system_mysql_db_fix50030.test:
  WL #3031
  
  New system_mysql_db tests required adding servers table creation. Some more
  comments in these tests would have been nice to explain what they do ;)
scripts/mysql_create_system_tables.sh:
  WL# 3031
  
  Added utf8 charset to table def
scripts/mysql_fix_privilege_tables.sql:
  WL# 3031
  
  Added servers table to mysql_fix_privilege_tables

into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build

Change to test results, committing so I can clone to another box to complete merge.

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-arch-wl3031-merge


mysql-test/lib/init_db.sql:
  Auto merged
mysql-test/r/1st.result:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/mysqlcheck.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
mysql-test/r/sp.result:
  WL# 3031
  
  More fun with error codes. These error codes vary in the result files because new error codes have been added
mysql-test/r/sp_gis.result:
  WL# 3031
  
  More fun with error codes. These error codes vary in the result files because new error codes have been added

Post-commit issues fixed
* Test results for other tests fixed due to added error #s
* Memory allocation/free issues found with running with valgrind
* Fix to mysql-test-run shell script to run federated_server test (installs
mysql.servers table properly)


mysql-test/r/1st.result:
  WL #3031
  
  New result for 1st test
mysql-test/r/backup.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/connect.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/information_schema.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/mysql.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/mysqlcheck.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/ndb_dd_basic.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/ndb_dd_ddl.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/select.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/show_check.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/sp.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/sp_gis.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/sp_trans.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/system_mysql_db.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/type_timestamp.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/warnings.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/xml.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
scripts/mysql_create_system_tables.sh:
  WL #3031
  
  Fixed old mysql-test-run.sh script to work with new mysql.servers table as reported
  by Cisco
sql/sql_yacc.yy:
  WL# 3031
  
  OPTIONS/options must be usable as table or column name.
storage/federated/ha_federated.cc:
  WL# 3031
  
  * Fixed allocation and free issues (warnings found with --valgrind)
  * Fixed cast issues
  * Made sure port was set accordingly

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


client/mysql.cc:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work

mysql-test/lib/mtr_unique.pl:
  do not autorelease build ids when a child dies

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


scripts/Makefile.am:
  Auto merged

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


scripts/Makefile.am:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged

scripts/Makefile.am:
  pass --sysconfdir to scripts
scripts/mysqlaccess.sh:
  use --sysconfdir instead of hardcoded /etc
scripts/mysqld_multi.sh:
  use --sysconfdir instead of hardcoded /etc

into  example.com:/work/mysql-5.1-maint

mysql-test/t/events_bugs.test:
  let events_bugs not fail because of timing
sql/sql_table.cc:
  if the db or name has been changed ALTER_RENAME,
  then fix table_list
  Solution by having the second table added in the parser to the
  list of used tables, won't work because checking of rights of merge
  tables goes over table_list->next_local and checks the rights, so
  we will fail there.
sql/sql_yacc.yy:
  fix name - prevents ddd from correct working

into  mysql.com:/home/hf/work/pfix/my51-pfix


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

mysql-test/r/gis.result:
  result fixed
mysql-test/t/gis.test:
  path to datafile fixed

into  mysql.com:/home/hf/work/22372/my51-22372


mysql-test/t/gis.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
mysql-test/r/gis.result:
  SCCS merged
sql/field.h:
  merging

mysql-test/r/gis.result:
  result fixed
sql/field.cc:
  Field_*::reset() now returns int
sql/sql_load.cc:
  merging fix

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


client/mysqltest.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge