bzr commit into mysql-6.0 tree (marc.alff:2702) Bug#37525

[Marc Alff]

#At file:///home/malff/BZR-TREE/mysql-6.0-cleanup/

------------------------------------------------------------
revno: 2702
revision-id: marc.alff@stripped
parent: mats@stripped
parent: marc.alff@stripped
committer: Marc Alff <marc.alff@stripped>
branch nick: mysql-6.0-cleanup
timestamp: Tue 2008-07-08 12:40:32 -0600
message:
  Manual merge of mysql_5.1-bugteam to mysql_6.0-bugteam
removed:
  mysql-test/r/parser.result     parser.result-20080707155630-vdiryhmexytcgu8d-1
  mysql-test/t/parser.test       parser.test-20080707155639-r5y8iqlookh6z34g-1
renamed:
  mysql-test/r/parser.result.moved => mysql-test/r/parser.result
sp1f-parser.result-20061102180149-bsa2xldfwvg4sfdweuafqehf2rt2oook
  mysql-test/t/parser.test.moved => mysql-test/t/parser.test
sp1f-parser.test-20061102180149-wb5wy27m3dv5htbxhutfiarxmrcsangd
modified:
  mysql-test/suite/funcs_1/r/falcon_storedproc.result
sp1f-falcon_storedproc.re-20071105143430-qtktbak36auhmy5oesxwkzqmfojjkatl
  mysql-test/suite/funcs_1/r/innodb_storedproc.result
sp1f-innodb_storedproc.re-20070206175435-rgnzc2jds3aldhbgzkercseghr6gn3ea
  mysql-test/suite/funcs_1/r/memory_storedproc.result
sp1f-memory_storedproc.re-20070206175436-kdub7wmixdd5iahs4y6t6osgcc2uajyb
  mysql-test/suite/funcs_1/r/myisam_storedproc.result
sp1f-myisam_storedproc.re-20070206175437-milfj5u3wkpto57wryhyj4dp7limye6p
  mysql-test/suite/funcs_1/r/ndb_storedproc.result
sp1f-ndb_storedproc.resul-20070206121932-pdx2oaabbgk7zul4itoolrjonzpe27ui
  mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
sp1f-storedproc_master.in-20070206175437-kmzbscdyh3kuwaj7hjkx77a652ukh5zv
  mysql-test/suite/funcs_1/t/disabled.def
sp1f-disabled.def-20070206175437-omhbgzpxfjoru23leqkxfztodlmdl4af
    ------------------------------------------------------------
    revno: 2497.259.10
    revision-id: marc.alff@stripped
    parent: marc.alff@stripped
    committer: Marc Alff <marc.alff@stripped>
    branch nick: mysql-5.1-cleanup
    timestamp: Tue 2008-07-08 10:33:09 -0600
    message:
      Cleanup merge issues in mysql-test/t/parser.test
    removed:
      mysql-test/r/parser.result     parser.result-20080707155630-vdiryhmexytcgu8d-1
      mysql-test/t/parser.test       parser.test-20080707155639-r5y8iqlookh6z34g-1
    renamed:
      mysql-test/r/parser.result.moved => mysql-test/r/parser.result
sp1f-parser.result-20061102180149-bsa2xldfwvg4sfdweuafqehf2rt2oook
      mysql-test/t/parser.test.moved => mysql-test/t/parser.test
sp1f-parser.test-20061102180149-wb5wy27m3dv5htbxhutfiarxmrcsangd
    ------------------------------------------------------------
    revno: 2497.259.9
    revision-id: marc.alff@stripped
    parent: mats@stripped
    committer: Marc Alff <marc.alff@stripped>
    branch nick: mysql-5.1-cleanup
    timestamp: Tue 2008-07-08 10:32:02 -0600
    message:
      Bug#37525 funcs_1: <engine>_storedproc.test fail
      
      Fixed the test to expect the correct result.
      The previous test script was in fact affected by 26030,
      and wrongly expected a ER_PARSE_ERROR error.
    modified:
      mysql-test/suite/funcs_1/r/innodb_storedproc.result
sp1f-innodb_storedproc.re-20070206175435-rgnzc2jds3aldhbgzkercseghr6gn3ea
      mysql-test/suite/funcs_1/r/memory_storedproc.result
sp1f-memory_storedproc.re-20070206175436-kdub7wmixdd5iahs4y6t6osgcc2uajyb
      mysql-test/suite/funcs_1/r/myisam_storedproc.result
sp1f-myisam_storedproc.re-20070206175437-milfj5u3wkpto57wryhyj4dp7limye6p
      mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
sp1f-storedproc_master.in-20070206175437-kmzbscdyh3kuwaj7hjkx77a652ukh5zv

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