bzr commit into mysql-5.1-bugteam tree (Matthias.Leich:2682) Bug#37114

[Matthias Leich]

#At file:///work2/5.0/mysql-5.0-bugteam-push/

------------------------------------------------------------
revno: 2682
revision-id: matthias.leich@stripped
parent: matthias.leich@stripped
parent: azundris@stripped
committer: Matthias Leich <Matthias.Leich@stripped>
branch nick: mysql-5.0-bugteam-push
timestamp: Do 2008-09-18 15:32:06 +0200
message:
  Merge actual tree -> local tree
  no conflicts
modified:
  mysql-test/r/loaddata.result  
sp1f-loaddata.result-20030505115238-y53yqooyomv7c43r2heznierboaww576
  mysql-test/t/loaddata.test    
sp1f-loaddata.test-20030505115238-2kz3yrlkdadbbcxdc3cncvt7ofzo2ln5
  sql/sql_class.cc              
sp1f-sql_class.cc-19700101030959-rpotnweaff2pikkozh3butrf7mv3oero
  sql/sql_class.h               
sp1f-sql_class.h-19700101030959-jnqnbrjyqsvgncsibnumsmg3lyi7pa5s
  sql/sql_load.cc               
sp1f-sql_load.cc-19700101030959-hoqlay5we4yslrw23xqedulkejw6a3o5
    ------------------------------------------------------------
    revno: 2679.1.3
    revision-id: azundris@stripped
    parent: azundris@stripped
    committer: Tatiana A. Nurnberg <azundris@stripped>
    branch nick: 50-37114
    timestamp: Do 2008-09-18 11:24:50 +0200
    message:
      Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DATA     
Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DATA INFILE
      
      tweaked test to make embedded server happy
    modified:
      mysql-test/r/loaddata.result  
sp1f-loaddata.result-20030505115238-y53yqooyomv7c43r2heznierboaww576
      mysql-test/t/loaddata.test    
sp1f-loaddata.test-20030505115238-2kz3yrlkdadbbcxdc3cncvt7ofzo2ln5
    ------------------------------------------------------------
    revno: 2679.1.2
    revision-id: azundris@stripped
    parent: azundris@stripped
    parent: vvaintroub@stripped
    committer: Tatiana A. Nurnberg <azundris@stripped>
    branch nick: 50-37114
    timestamp: Mi 2008-09-17 17:44:15 +0200
    message:
      auto-merge
    modified:
      sql/stacktrace.c              
sp1f-stacktrace.c-20010513221240-wwmyzt4dneecpsyuor3g7w3zacc6u4mq
    ------------------------------------------------------------
    revno: 2679.1.1
    revision-id: azundris@stripped
    parent: patrick.crews@stripped
    committer: Tatiana A. Nurnberg <azundris@stripped>
    branch nick: 50-37114
    timestamp: Mi 2008-09-17 08:34:00 +0200
    message:
      Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DATA
INFILE
      
      NO_BACKSLASH_ESCAPES was not heeded in LOAD DATA INFILE
      and SELECT INTO OUTFILE.  It is now.
    modified:
      mysql-test/r/loaddata.result  
sp1f-loaddata.result-20030505115238-y53yqooyomv7c43r2heznierboaww576
      mysql-test/t/loaddata.test    
sp1f-loaddata.test-20030505115238-2kz3yrlkdadbbcxdc3cncvt7ofzo2ln5
      sql/sql_class.cc              
sp1f-sql_class.cc-19700101030959-rpotnweaff2pikkozh3butrf7mv3oero
      sql/sql_class.h               
sp1f-sql_class.h-19700101030959-jnqnbrjyqsvgncsibnumsmg3lyi7pa5s
      sql/sql_load.cc               
sp1f-sql_load.cc-19700101030959-hoqlay5we4yslrw23xqedulkejw6a3o5

Attachment: [text/text/x-diff] patch-2682.diff