into  recycle.(none):/src/bug23491/my51-bug23491


mysql-test/t/mysqldump.test:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/mysqldump.result:
  SCCS merged

- 5.0 merged to 5.1 differences.


sql/item_create.cc:
  Bug #23491 MySQLDump prefix function call in a view by database name
  - Added use_explicit_name to Create_sp_func::create method.
  - Default use_explicit_name to false when db name not specified.
  - Use use_explicit_name when creating sp_name object.
sql/item_create.h:
  Bug #23491 MySQLDump prefix function call in a view by database name
  - Updated virtual function definition.
sql/sql_yacc.yy:
  Bug #23491 MySQLDump prefix function call in a view by database name
  - Use new create method.

- Copy all *.MY* files from std_data/, we have some .MYD and .MYI
files from 4.1 there
5.0 version of make_win_bin_dist copies everything in std_data/


scripts/make_win_bin_dist:
  Copy all *.MY* files from std_data/, we have some .MYD and .MYI
  files from 4.1 there
  5.0 version of make_win_bin_dist copies everything in std_data/

into  recycle.(none):/src/bug23491/my51-bug23491


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/sp-code.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual Merge.
sql/sql_yacc.yy:
  Manual Merge.

BitKeeper/deleted/.del-rpl_ssl_verify_server.test:
  Delete: mysql-test/t/rpl_ssl_verify_server.test
BitKeeper/deleted/.del-rpl_ssl_verify_server.result:
  Delete: mysql-test/r/rpl_ssl_verify_server.result
mysql-test/r/rpl_known_bugs_detection.result:
  Add new column after merge
mysql-test/r/rpl_ssl.result:
  Add new column after merge
mysql-test/r/rpl_ssl1.result:
  Merge test and result file
mysql-test/t/rpl_ssl1.test:
  Merge test and result file

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/rpl_slave_status.result:
  Auto merged
mysql-test/r/rpl_stm_log.result:
  Auto merged
sql/lex.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/t/rpl_ssl1.test:
  Auto merged

 - Add MASTER_SSL_VERIFY_SERVER_CERT option to CHANGE MASTER TO
 - Add Master_Ssl_Serify_Server_Cert to SHOW SLAVE STATUS
 - Save and restore ssl_verify_server_cert  to master info file
   setting it to disabled as default.


mysql-test/r/rpl_000015.result:
  Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_change_master.result:
  Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_empty_master_crash.result:
  Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_flushlog_loop.result:
  Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_loaddata.result:
  Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_log_pos.result:
  Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_rbr_to_sbr.result:
  Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_redirect.result:
  Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_replicate_do.result:
  Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_rotate_logs.result:
  Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_row_max_relay_size.result:
  Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_server_id1.result:
  Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_server_id2.result:
  Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_slave_status.result:
  Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_ssl1.result:
  Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_stm_log.result:
  Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_stm_max_relay_size.result:
  Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_stm_reset_slave.result:
  Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_stm_until.result:
  Update test result after adding new column to SHOW SLAVE STATUS
mysql-test/t/rpl_ssl1.test:
  Change to "query_vertical show slave status"
sql/lex.h:
  Add new token for MASTER_SSL_VERIFY_SERVER_CERT
sql/repl_failsafe.cc:
  Turn on verification of master cert if so requested
sql/rpl_mi.cc:
  Add new variable to MASTER_INFo and save/restore it from/to line 15 of master info
  file
sql/rpl_mi.h:
  Add variable for ssl_verify_server_cert to MASTER_INFO
sql/slave.cc:
  Turn on verification of master cert if so requested
  Add new column to SHOW  SLAVE STATUS
sql/sql_lex.h:
  Add ssl_verify_server_cert to "st_lex_master_info" struct - allow
  it to be UNCHANGED just like the ssl option.
sql/sql_repl.cc:
  Add ssl_verify_server_cert to "st_lex_master_info" struct - allow
  it to be UNCHANGED just like the ssl option.
sql/sql_yacc.yy:
  Add MASTER_SSL_VERIFY_SERVER_CERT to CHANGE MASTER TO
mysql-test/t/rpl_ssl_verify_server.test:
  New BitKeeper file ``mysql-test/t/rpl_ssl_verify_server.test''
mysql-test/r/rpl_ssl_verify_server.result:
  New BitKeeper file ``mysql-test/r/rpl_ssl_verify_server.result''

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


sql/sql_yacc.yy:
  Auto merged
mysql-test/t/rpl_ignore_table.test:
  Merge, move the sync_slave_with_master up to correct place

into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


sql/sql_yacc.yy:
  Auto merged
mysql-test/r/rpl_ignore_table.result:
  Merge
mysql-test/t/rpl_ignore_table.test:
  Merge, add a connection master to run following test on master

 - GRANT and REVOKE statments didn't have the "updating" flag set and
   thus statements with a table specified would not replicate if
   slave filtering rules where turned on.
   For example "GRANT ... ON test.t1 TO ..." would not replicate.


mysql-test/r/rpl_ignore_table.result:
  Add test results
mysql-test/t/rpl_ignore_table.test:
  Add tests
sql/sql_yacc.yy:
  Pass option TL_OPTION_UPDATING to 'add_table_to_list' when parsing a
  GRANT or REVOKE and a table specifier is found. This will set the
  property "updating" on the table and thus the slave filtering rules will 
  be applied.
  
  Without setting updating the statement will be not
  replicated - since "it's not updating anything" - an optimization
  to quickly skip SELECT's and similar.

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


mysql-test/r/strict.result:
  Auto merged
mysql-test/t/openssl_1.test:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


mysql-test/r/func_group.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
sql/item.h:
  Auto merged
sql/item_sum.cc:
  Auto merged

  post-merge test result fixup


mysql-test/r/create.result:
  post-merge test result fixup

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


mysql-test/t/openssl_1.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
mysql-test/r/create.result:
  Manual merge
mysql-test/t/create.test:
  Manual merge

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/strict.result:
  Auto merged
mysql-test/t/openssl_1.test:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50


myisam/mi_open.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/create.result:
  Manual merge
mysql-test/t/create.test:
  Manual merge

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

  post-merge fixup of test result


mysql-test/r/ndb_gis.result:
  post-merge fixup of test result

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


mysql-test/r/strict.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.blaudden:/home/msvensson/mysql/bug26837/my51-bug26837


sql/log_event.cc:
  Auto merged

into  mysql.com:/home/ram/work/b21976/my50-b21976

into  mysql.com:/home/ram/work/b21976/my51-b21976

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


BitKeeper/deleted/.del-bdb_gis.result:
  Auto merge
mysql-test/include/gis_generic.inc:
  Auto merge
mysql-test/r/archive_gis.result:
  ?
  Auto merge
mysql-test/r/innodb_gis.result:
  Auto merge
mysql-test/r/ndb_gis.result:
  Manual merge
mysql-test/r/strict.result:
  Auto merge
mysql-test/r/type_date.result:
  Auto merge
mysql-test/t/strict.test:
  Auto merge
sql/field.cc:
  Auto merge
sql/field.h:
  Auto merge