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

into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1

into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1

into  mysql.com:/usr/local/mysql/mysql-5.1-new

into  zim.(none):/home/brian/mysql/dep-5.1

of hostname in query results.


mysql-test/r/events_logs_tests.result:
  Update results
mysql-test/t/events_logs_tests.test:
  Replace user_host in results, since it is system dependent.

into  zim.(none):/home/brian/mysql/dep-5.1

BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
  Delete: scripts/mysql_explain_log.sh
scripts/Makefile.am:
  Removing mysql_explain_log
scripts/make_binary_distribution.sh:
  Removing mysql_explain_log
support-files/mysql.spec.sh:
  Remove reference to mysql_explain_log

into  mysql.com:/home/jimw/my/mysql-5.1-clean

into  mysql.com:/home/jimw/my/mysql-5.1-clean

into  zim.(none):/home/brian/mysql/dep-5.1


sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/r/log_tables.result:
  Merge conflict
mysql-test/t/log_tables.test:
  Merge conflict

  Rename load_event() to load_named_event(), to avoid name clash on HP-UX


sql/event_scheduler.cc:
  Rename load_event() to load_named_event(), to avoid name clash on HP-UX
sql/event_scheduler.h:
  Rename load_event() to load_named_event(), to avoid name clash on HP-UX

Fixed core dump in --help


include/heap.h:
  Removed a wrong character (ascii 0xa0), which looked like a space.
  This will cause some debuggers display the source code in a wrong
  way. May cut the rest of the file off and looks like a debugger
  problem, which it isn't.
mysys/my_getopt.c:
  Removed a wrong character (ascii 0xa0), which looked like a space.
  This will cause some debuggers display the source code in a wrong
  way. May cut the rest of the file off and looks like a debugger
  problem, which it isn't.
sql/mysqld.cc:
  Wrong type.

into lmy004.:/work/mysql-5.1-release

make us see at least with gcc the function proto. this can be extended
probably for windows too.
Fix build on intelxeon3 (sun compiler and others)


sql/event_scheduler.cc:
  __FUNCTION__ is not available everywhere.
  make us see at least with gcc the function proto. this can be extended
  probably for windows too.

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

into lmy004.:/work/mysql-5.1-release-17619-try3

mysql-test/r/log_tables.result:
  update result so test is less fragile
mysql-test/t/log_tables.test:
  update test so it is less fragile

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

into lmy004.:/work/mysql-5.1-release-17619-try3

mysql-test/r/not_embedded_server.result:
  update result
mysql-test/r/sp-threads.result:
  update result
sql/event_scheduler.h:
  fix build error with SUN compiler
sql/mysqld.cc:
  fix problem with --init-file which was expecting to be the only running
  thread. nevertheless Events should be started as close as possible to the
  place connections are handled.

into lmy004.:/work/mysql-5.1-release-17619-try3

drop users at the end of events_stress


mysql-test/r/ps_1general.result:
  update result
mysql-test/r/skip_name_resolve.result:
  update result
mysql-test/r/sp_notembedded.result:
  update result
mysql-test/r/status.result:
  update result
mysql-test/t/events_stress.test:
  drop users created in the test

into  mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged

 - Terminate configure with error(and message) if --with-yassl or --with-openssl is used.


config/ac-macros/ssl.m4:
  Add error message if --with-yassl or --with-openssl is used

 - Move class MY_HOOKS out of function


sql/sql_insert.cc:
  Move class MY_HOOKS out of function 'select_create::prepare'

Remove unused and obsolete mgmapi functionality (that did nothing anyway).


storage/ndb/include/mgmapi/mgmapi.h:
  remove dead internal ndb_mgm_get_stat_port function.
storage/ndb/src/mgmapi/mgmapi.cpp:
  remove ndb_mgm_get_stat_port
  
  was only marked for internal use.
  dead (in 5.0 as well, only removed in 5.1 for safety)
storage/ndb/src/mgmsrv/Services.cpp:
  remove dead 'get statport'
storage/ndb/src/mgmsrv/Services.hpp:
  remove dead getStatPort

into lmy004.:/work/mysql-5.1-release-17619-try3

var->save_result.ulonglong_value and not var->save_result.ulong_value

into lmy004.:/work/mysql-5.1-release

sql/event_scheduler.cc:
  remove unused variables
  fix win32 build problem - pthread_mutex_lock() is void there
sql/event_scheduler.h:
  pthread_mutex_lock() is void on win32. This fixes the win32 build.
sql/event_timed.cc:
  remove unused code & variables

into  mysql.com:/home/jimw/my/mysql-5.1-clean

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

libmysqld/Makefile.am:
  Auto merged
mysql-test/r/events.result:
  Auto merged
mysql-test/r/events_bugs.result:
  Auto merged
mysql-test/r/events_logs_tests.result:
  Auto merged
mysql-test/r/events_microsec.result:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/mysql_priv.h:
  Auto merged
mysql-test/r/events_stress.result:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/table.cc:
  Auto merged

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