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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

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


sql/item_func.cc:
  Auto merged

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


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged

This changeset fixes the problem where mysql, when run as a service,
can't "detect" it's own data directory.


sql/mysqld.cc:
  When running on Windows we check to see if we have a hard path in 
  my_progname.  If not, then we use GetModuleFilename to get the full path
  for the executing module.  This allows the program to determine where
  it's at when running as a service.

mysql-test/r/information_schema.result:
  Fix a race (updated result file)
mysql-test/t/information_schema.test:
  Fix a race in a test.

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


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

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


mysql-test/r/events_bugs.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/events.test:
  Auto merged
sql/event_data_objects.cc:
  Auto merged
sql/event_data_objects.h:
  Auto merged
sql/event_db_repository.h:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/events.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_servers.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/r/events.result:
  Manual merge.
sql/event_db_repository.cc:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.

mysql-test/r/crash_commit_before.result:
  Cleanup
mysql-test/r/rpl_ignore_table.result:
  Cleanup
mysql-test/r/rpl_packet.result:
  Cleanup
mysql-test/r/rpl_ssl.result:
  Cleanup
mysql-test/t/crash_commit_before.test:
  Cleanup
mysql-test/t/rpl_ignore_table.test:
  Cleanup
mysql-test/t/rpl_packet.test:
  Cleanup
mysql-test/t/rpl_ssl.test:
  Cleanup

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

into  recycle.(none):/src/bug23491_ii/my50-bug23491_ii

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


mysql-test/t/mysqldump.test:
  Auto merged

mysql-test/t/mysqldump.test:
  Fix for failing Windows test.

into  bodhi.local:/opt/local/work/mysql-5.0-runtime


sql/item_func.cc:
  Auto merged

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


client/client_priv.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/rpl_deadlock_innodb.result:
  Auto merged
mysql-test/r/rpl_flushlog_loop.result:
  Auto merged
mysql-test/r/rpl_known_bugs_detection.result:
  Auto merged
mysql-test/r/rpl_ndb_basic.result:
  Auto merged
mysql-test/r/rpl_ndb_extraCol.result:
  Auto merged
mysql-test/r/rpl_ndb_sync.result:
  Auto merged
mysql-test/r/rpl_rbr_to_sbr.result:
  Auto merged
mysql-test/r/rpl_row_inexist_tbl.result:
  Auto merged
mysql-test/r/rpl_row_max_relay_size.result:
  Auto merged
mysql-test/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
mysql-test/r/rpl_stm_max_relay_size.result:
  Auto merged
mysql-test/r/rpl_stm_until.result:
  Auto merged
mysql-test/r/sp-code.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/gis.result:
  Merge 5.0->5.1
mysql-test/r/rpl_000015.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_change_master.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_loaddata.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_log_pos.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_ndb_log.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_rotate_logs.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_row_log.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_row_log_innodb.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_row_reset_slave.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_row_until.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_server_id1.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_server_id2.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_stm_log.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_stm_reset_slave.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/t/gis.test:
  Merge 5.0->5.1

into  naruto.:C:/cpp/mysql-5.1-runtime


sql/set_var.cc:
  Auto merged
sql/mysqld.cc:
  manual merge

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/gis.result:
  SCCS merged
mysql-test/t/gis.test:
  SCCS merged

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

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


mysql-test/t/create.test:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge
mysql-test/r/create.result:
  Manual merge of revert

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


myisam/mi_open.c:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/create.result:
  SCCS merged
mysql-test/t/create.test:
  SCCS merged

myisam/mi_open.c:
  Exclude
mysql-test/r/create.result:
  Exclude
mysql-test/t/create.test:
  Exclude
sql/table.cc:
  Exclude

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


mysql-test/mysql-test-run.pl:
  Manual merge 5.0->5.1

Remove the setting of --local-load parameter for mysqlbinlog and leave that to the testcases
to decide what params to use.


mysql-test/mysql-test-run.pl:
  Remove the setting of --local-load parameter for mysqlbinlog and leave that to the testcases
  to decide what params to use.

- Some variables in I_S.GLOBAL_STATUS were depending on a network
  connection in order to evaluate. Since no network connection is 
  present during the execution of an event, this caused the server
  to crash.
- The variable function hooks does now verify that the vio-
  object is valid before attempting to use it.


mysql-test/r/information_schema.result:
  Added test case.
mysql-test/t/information_schema.test:
  Added test case.

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt


sql/sql_select.cc:
  Auto merged

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


sql/sql_select.cc:
  Auto merged

into  olga.mysql.com:/home/igor/mysql-5.1-opt


mysql-test/r/row.result:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge

into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl

new test case until the valgrind failure is fixed, 
reported in bug 27564)


mysql-test/t/disabled.def:
  New test case shows valgrind failre

mysql-test/t/rpl_row_create_table.test:
  Adding sync to allow slave to complete cleanup drop before resetting
  storage engine.

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


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