into  calliope.local.cmiller:/Volumes/Source/src/mysql-5.1-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

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

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

 - Implement --secure-file-priv=<dir> option that limits
  "load_file", "LOAD DATA" and "SELECT .. INTO OUTFILE" to work 
  with files in specified dir.
 - Use above option for mysqld in mysql-test-run.pl 

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

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

into  olga.mysql.com:/home/igor/mysql-5.1-opt

into  olga.mysql.com:/home/igor/mysql-5.1-opt

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug25807/my51-bug25807

Showstopper and regression against 5.0.24.

Previously, we ignored seek() errors (see Bug#22828) and let seek()s
against pipes fail.  Now, since we check that a seek didn't fail,
and return without reading, this bug popped up.

This restores the behavior for file-ish objects that could never be 
seek()ed.

into  olga.mysql.com:/home/igor/mysql-5.1-opt

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

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

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

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

to be expanded in same cases 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/tmpmerge

  Rename: BitKeeper/deleted/.del-README.txt -> BitKeeper/deleted/.del-README.txt-renamed

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

into  olga.mysql.com:/home/igor/mysql-5.1-opt

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

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

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

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

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26209

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt

into  mysql.com:/home/kent/bk/tmp3/mysql-5.1

into  mysql.com:/home/hf/work/25492/my51-25492

into  mysql.com:/home/hf/work/25492/my50-25492