mysql-test/r/events.result:
  Auto merged
sql/event.cc:
  Auto merged
sql/event.h:
  Auto merged
sql/event_executor.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/event_timed.cc:
  manual merge

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


client/mysqltest.c:
  Auto merged

  Rearrange out of order options in option struct.


client/mysqltest.c:
  Rearrange out of order options in option struct.

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


sql/mysqld.cc:
  manual merge.

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new

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


client/mysqldump.c:
  Auto merged

  Fix out of order entries in option struct.


sql/mysqld.cc:
  Fix out of order entries in option struct.

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

client/mysqldump.c:
  snprintf =>  my_snprintf

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


client/mysqldump.c:
  Auto merged

client/mysqldump.c:
  Declare variable in start of function

into  mysql.com:/opt/local/work/mysql-5.1-new

mysql-test/t/mysqltest.test:
  Fix merge

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


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
mysql-test/t/mysqldump.test:
  Merge with my own merge
mysql-test/t/mysqltest.test:
  Merge

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


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

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


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge locationwhere to search for client bins

client/mysqltest.c:
  Fix after merge, do_eval has three args
  Remove extre return in do_block

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


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Merge

Add new parameter to do_eval so that only unescaped variables in input string is expanded and rest of string is left untouched.


client/mysqltest.c:
  Add new parameter to 'do_eval' that will add any escape chars found in the input string to the output string. 
  This is used in 'do_system' and in 'do_exec' where only unescaped variables
  will be expanded, rest of the string will be left untouched.
mysql-test/r/mysqltest.result:
  Update test result
mysql-test/t/mysqldump.test:
  Revert previous patch that added extra \\ in "exec" command
mysql-test/t/mysqltest.test:
  Revert previous patch that added extra \\ in exec command

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

mysql-test/t/disabled.def:
  enable rpl_ndb_blob* again, disabled by accident

into  mysql.com:/space/pekka/ndb/version/my51

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

  Updated with echos for the results file requested by lars


mysql-test/t/rpl_row_mysqlbinlog.test:
  Updated with echos for the results file requested by lars
mysql-test/r/rpl_row_mysqlbinlog.result:
  Updated with echos for the results file requested by lars

into  mysql.com:/space/pekka/ndb/version/my51

mysql-test/r/ndb_restore.result:
  fix backup id using jeb's ndb_backup.inc
mysql-test/t/ndb_restore.test:
  fix backup id using jeb's ndb_backup.inc

mysql-test/t/rpl_row_mysqlbinlog.test:
  New mysqlbinlog test for row based binlogs per lars request for WL#2321
mysql-test/t/rpl_row_mysqlbinlog-master.opt:
  New mysqlbinlog test for row based binlogs per lars request for WL#2321
mysql-test/r/rpl_row_mysqlbinlog.result:
  New mysqlbinlog result WL#2321

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

into  linux.site:/home/reggie/work/mysql-5.1


sql/share/errmsg.txt:
  Auto merged

We changed the error message to more clearly reflect the fact
that we are counting parts and subparts


mysql-test/r/partition_mgm_err.result:
  updated error message
sql/share/errmsg.txt:
  updated error message

  Change for 'make distcheck'
libmysqld.vcproj:
  Typo


VC++Files/libmysqld/libmysqld.vcproj:
  Typo
mysql-test/ndb/Makefile.am:
  Change for 'make distcheck'
storage/archive/Makefile.am:
  Change for 'make distcheck'
plugin/fulltext/Makefile.am:
  Change for 'make distcheck'
storage/csv/Makefile.am:
  Change for 'make distcheck'
storage/heap/Makefile.am:
  Change for 'make distcheck'

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


sql/ha_ndbcluster_binlog.cc:
  Auto merged

sql/ha_ndbcluster_binlog.cc:
  A post-merge fix.
sql/log_event.cc:
  A post-merge fix.