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


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

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


client/mysqltest.c:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged

client/mysqltest.c:
  Add comments
  Group inits logically

Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero.


client/mysqltest.c:
  Remove lineno_stack, instead use the already existing file_stack and add a new variable lineno to keep track of what line in the file we are at.
mysql-test/r/mysqltest.result:
  Correct test result, "At line 1" should be printed

client/mysqltest.c:
  Disable "let" assign each column of query to own var
mysql-test/r/mysqltest.result:
  Remove test results for disabled test
mysql-test/t/mysqltest.test:
  Disable test for "let assigns each column of query to own var"

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

into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration

  added I_S 'PARTITIONS' table

into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration


client/mysqltest.c:
  Auto merged

client/mysqltest.c:
  Allocate one extra byte for string terminator in varname

into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration


client/mysqltest.c:
  Auto merged
sql/sql_select.cc:
  Auto merged

client/mysqltest.c:
  Revert to original version of copying name and value into var in var_init

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0

There is a specific rpl_ignore_grant test case for GRANT.


mysql-test/r/rpl_ignore_revoke.result:
  New BitKeeper file ``mysql-test/r/rpl_ignore_revoke.result''
mysql-test/t/rpl_ignore_revoke-slave.opt:
  New BitKeeper file ``mysql-test/t/rpl_ignore_revoke-slave.opt''
mysql-test/t/rpl_ignore_revoke.test:
  New BitKeeper file ``mysql-test/t/rpl_ignore_revoke.test''

into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration

into  rurik.mysql.com:/home/igor/mysql-5.1

into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration


mysql-test/r/grant.result:
  Auto merged
sql/sql_acl.cc:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration

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

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

into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration


client/mysqltest.c:
  Auto merged
config/ac-macros/yassl.m4:
  Auto merged
include/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/sql_acl.cc:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqlslap.result:
  Real output produced, remove "echo"
mysql-test/t/mysqlslap.test:
  Real output produced, remove "echo"

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

sql/ha_archive.h:
  Removed unneeded include.

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

mysql-test/r/archive.result:
  New result file.
mysql-test/t/archive.test:
  Added new tests for indexes. Also accidently updated it so that all "FROM" are now capitalized :)
sql/ha_archive.cc:
  Changed comparision function to compare memory locations. 
  
  Modified function for storing the auto_increment. 
  Removed useless DBUG_PRINT

  Fix word.
  (no test results needed fixing)


sql/share/errmsg.txt:
  Fix word.
  (no test results needed fixing)

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


sql/handler.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_class.cc:
  accepted Mat's changes to the template defs

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

mysql-test/r/mysqlslap.result:
  Update test result
mysql-test/t/mysqlslap.test:
  Print something when test is complete

into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/mysqltest.test:
  Changed to "test ! -e" instead of "test -s"

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

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


mysql-test/r/grant.result:
  Auto merged
sql/sql_acl.cc:
  Auto merged

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

configure.in:
  1) Update version, now that 5.1.5 has been cloned.
  2) Get rid of erroneous merge, NDB version is deduced automatically from global version.

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


sql/sql_acl.cc:
  Auto merged