From: Martin Zaun
Date: October 22 2010 2:45am
Subject: bzr commit into mysql-5.1-telco-6.3 branch (martin.zaun:3318)
List-Archive: http://lists.mysql.com/commits/121606
Message-Id: <201010220245.o9M1WCmb009419@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1705555409=="

--===============1705555409==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/mz/mysql/ndb-6.3-mtr-ndb-restore/ based on revid:martin.zaun@stripped

 3318 Martin Zaun	2010-10-21
      defined  var for ndb-6.3 mtr tests (as available in >= 7.0).

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-10-12 11:54:35 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-10-22 02:45:09 +0000
@@ -2008,6 +2008,11 @@ sub environment_setup {
 		  ["storage/ndb/src/kernel", "bin", "libexec"],
 		  ["ndbmtd", "ndbd"]);
 
+    $ENV{'NDB_RESTORE'}=
+      my_find_bin($basedir,
+		  ["storage/ndb/tools", "bin"],
+		  "ndb_restore");
+
     $ENV{'NDB_TOOLS_DIR'}=
       my_find_dir($basedir,
 		  ["storage/ndb/tools", "bin"]);


--===============1705555409==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/martin.zaun@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@stripped
# target_branch: file:///Users/mz/mysql/ndb-6.3-mtr-ndb-restore/
# testament_sha1: ab4f81baaa532a6a2320bab70eba6a8c6f1cf98c
# timestamp: 2010-10-21 19:45:20 -0700
# base_revision_id: martin.zaun@stripped\
#   g4k3vx4c5kvo9nix
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeSiPQgAAZHfgFAwVOf//1YD
nRq////6UAO7t56nq956KY6QlERMDUMmpPYEmU/Ij0FAyep6RkBp6gZQEU89I1NPU0ZTI0AAANA0
NA0CUgE0KPaUxlPKPU00aaAAAGgABkUZT00KbEnlNM1MmGoepkaBoGmmg0AkkKnqeIZqjyTINqHq
bUA00AaGgAGjRpOXY9kd5ZFCrnYWFuK+IDJl697WRkIskdFbfXUp7ZECJs8huhaElQpDeVpe/XHu
2b5mUtaEKIHQOTbZdw/WODOPZo2gqnNdeHX3wQGx03TQyc/AhVxE8yz2o7VXZWYPXUmbJRlLqKnk
LBHDSJYmmgWX7ZBMZnViB4JqxwhwmMNCHZYQAl4CLSK+SumJ0PNpkjOyB5hYLr61segnXeIezlHu
OqeZ6hG+KLEooM0wgwJgUMLxl1FSnrHiGeKM8RDHJLbACV0xJChwY7DVFnvhhi1bAgc43bS7MQqS
p9GMUBrMqA/u6DabZjiETgDBQw222CYveDmFjBMRkEhWV6j+CkQx0JSqK63gwk9yZQtW9WL5F4ZI
peXCXvMCyitLoi6qklH9zkbMzyrPvNgEQ3CqThkipqxrB1g1Uvr2KZ0XW2fZMKGksDhKoLSce6BL
QlGN82rOxGRU4SKyLmIqCnEwQmVv9ZX/a9FcmKqBAmj1i6WNBDY0KDbq3fLPZcu1v39fsG98woyz
20VTIYem947mBgYHecMYG39/LxEG5Via5Q+X0mkee8I0PXaiH27GJ10CFldYVaKGNOTwzdWSl2yc
o2y+PgfEn4BDmaCzETQQ3nk1m7bI5hHkkRir1FuhSzqCaZ6uejuFykFVLiK8yyc4yUqVEPK00xxM
iH674cmfuVjcgY49JM2FUVdnSiyJclLCySl+5bebCM4oqQ1UzXcrbXxYRiKFm9qPdmkXHtUnmTdr
HHrg7GCtqWmKOEx2f4zsqCDPhZmTLiNkjTrJrsEmQvGvsKBWNxDJGkIFOfHW/CF/fCypPdrS03Gp
EoNSUhDgl6ay4HglYEm1aZBBjFxso4QSJGwQ3iLpDyOIrK70ka4p8yJ982YXf13V5J5VUI1KkhRT
jCwghHyNIWR08eENcjLTMMBEKFDmgIoPCueKsA3BpQW87g/iBEBKnIpiwZDPVUiGEM1F3GzSDF2B
COWuJJaEvmgMJOIIGkWUS57wiZcL1n5gx4BfPAWimNzskxtKQnqBWOZOHNuK0YIUgygFoMFwEpz8
AVbRhhVk86Cko69fjCAGZ5MhrCKYVNgNV8FgpxZpYigIZlaIJozURmNoONDYS8Ge7AWCYOSoKbqN
IbHItDbFyyiDZyEf7z/xdyRThQkOSiPQgA==


--===============1705555409==--