AKA someone pushed without testing.


mysql-test/r/partition_02myisam.result:
  Fixed error messages

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

sql/opt_range.cc:
  Fix a typo in dbug printout: print "min_val < partitioning_field < max_val",
  not "max_val < partitioning_field < max_val"

This patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support.


BitKeeper/deleted/.del-raid.h~2d2503a66b128ac6:
  Delete: include/raid.h
BitKeeper/deleted/.del-raid.cc~488f5fa6538394e1:
  Delete: mysys/raid.cc
BitKeeper/deleted/.del-raid2.c~fe7aea5fb4b9748c:
  Delete: mysys/raid2.c
include/Makefile.am:
  Removing raid
include/my_sys.h:
  Removing Raid
include/myisam.h:
  Removing raid
mysql-test/r/case.result:
  Cleaned up incomming tables
mysql-test/r/mysqlcheck.result:
  new results
mysql-test/t/case.test:
  Cleaned up test
mysql-test/t/mysqlcheck.test:
  Cleaned up two tests.
mysys/Makefile.am:
  Removed raid
mysys/my_static.c:
  Removed raid
storage/myisam/mi_check.c:
  Removed raid
storage/myisam/mi_info.c:
  Removed raid bits.

mysql-test/r/events_microsec.result:
  update results
mysql-test/t/events_microsec.test:
  use the newly introduced I_S.PROCESSLIST to check whether the scheduler is running.

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


sql/sql_show.cc:
  Auto merged

fix for bug#16411

last fixes


sql/event_executor.cc:
  fix message

sql/event_timed.cc:
  fix problem during merge

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


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

(Backported from mysql-5.1-new)


mysql-test/t/mysqldump.test:
  Fix mysqldump.test to work with non-standard --vardir.

fix for bug #16412 (post-merge fix)


mysql-test/r/sp.result:
  fix test result

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 lmy004.:/work/mysql-5.1-bug16412


sql/sql_show.cc:
  Auto merged

WL#1034 (Internal CRON)


mysql-test/r/grant.result:
  fix result file
sql/sql_show.cc:
  Fix output per bug #16412 (Events: SHOW PRIVILEGES gives incorrect information)

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