into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


mysys/my_write.c:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


sql/set_var.cc:
  Auto merged

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


mysql-test/suite/binlog/t/binlog_killed.test:
  Auto merged
mysys/my_write.c:
  Auto merged

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint

some platforms

Since the behavior of write(fd, buf, 0) is undefined, it may fail with
EFAULT on some architectures when buf == NULL. The error was propagated
up to a caller, since my_write() code did not handle it properly.

Fixed by checking the 'number of bytes' argument in my_write() and
returning before calling the write() system call when there is nothing
to write.


mysys/my_write.c:
  Return from my_write() before calling the write() system call when the
  number of bytes to be written is 0, since the behavior of write() in
  this case is not portable.

into  mysql.com:/home/ram/work/b31615/b31615.4.1

into  mysql.com:/home/ram/work/b31615/b31615.5.0


sql/set_var.cc:
  Auto merged

into  mysql.com:/home/ram/work/b31615/b31615.5.1

separate checking.

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint

into  mysql.com:/home/ram/work/b31615/b31615.5.1


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/set_var.cc:
  I will apply the patch after auto-merging

into  mysql.com:/home/ram/work/b31615/b31615.5.0


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged

into  pilot.mysql.com:/data/msvensson/mysql/bug30560/my51-bug30560


mysql-test/mysql-test-run.pl:
  Merge 5.0->5.1

into  mysql.com:/scratch/tnurnberg/20901/51-20901

into  mysql.com:/home/ram/work/b31604/b31604.5.1

into  mysql.com:/home/ram/work/b31349/b31349.5.0

into  mysql.com:/home/ram/work/b31349/b31349.5.1

mysql-test/mysql-test-run.pl:
  Use an array to store the valgrind options
  Deprecate --valgrind-options=s and instead use --valgrind-option(but allow
  PushBuild's) --valgrind-options=s usage.
  Make the variables local

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint

into  mysql.com:/home/ram/work/b31604/b31604.5.1

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint

into  polly.(none):/home/kaa/src/maint/bug30453/my51-bug28878


mysql-test/r/insert.result:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
strings/ctype-simple.c:
  Manual merge.

into  mysql.com:/home/ram/work/b31349/b31349.5.1

into  mysql.com:/home/ram/work/b31349/b31349.5.0

into  mysql.com:/home/ram/work/b31349/b31349.5.1


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item_strfunc.h:
  Auto merged

into  mysql.com:/home/ram/work/b31604/b31604.5.1


sql/set_var.cc:
  Auto merged

into  mysql.com:/home/ram/work/b31285/b31285.5.1

into  mysql.com:/scratch/tnurnberg/20901/51-20901


mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  mysql.com:/scratch/tnurnberg/20901/51-20901


mysql-test/r/create.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged