From 42df53d783b3314452e10937c245f6d07c9b6809 Mon Sep 17 00:00:00 2001
From: vasil <Unknown>
Date: Wed, 28 Jan 2009 06:21:44 +0000
Subject: [PATCH] branches/zip:

Adjust the paths in innodb_lock_wait_timeout.diff with a recent rename of
the test/result files in the MySQL tree.
---
 mysql-test/patches/innodb_lock_wait_timeout.diff | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mysql-test/patches/innodb_lock_wait_timeout.diff b/mysql-test/patches/innodb_lock_wait_timeout.diff
index 81fe87f7c0d..bc61a0f5841 100644
--- a/mysql-test/patches/innodb_lock_wait_timeout.diff
+++ b/mysql-test/patches/innodb_lock_wait_timeout.diff
@@ -1,5 +1,5 @@
---- mysql-test/t/innodb_lock_wait_timeout_basic.test.orig	2008-08-04 09:28:16.000000000 +0300
-+++ mysql-test/t/innodb_lock_wait_timeout_basic.test	2008-10-07 11:14:15.000000000 +0300
+--- mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test.orig	2008-08-04 09:28:16.000000000 +0300
++++ mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test	2008-10-07 11:14:15.000000000 +0300
 @@ -37,10 +37,6 @@
  #   Check if Value can set                                         #
  ####################################################################
@@ -25,8 +25,8 @@
  
  SELECT COUNT(@@GLOBAL.innodb_lock_wait_timeout);
  --echo 1 Expected
---- mysql-test/r/innodb_lock_wait_timeout_basic.result.orig	2008-08-04 09:27:50.000000000 +0300
-+++ mysql-test/r/innodb_lock_wait_timeout_basic.result	2008-10-07 11:15:14.000000000 +0300
+--- mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result.orig	2008-08-04 09:27:50.000000000 +0300
++++ mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result	2008-10-07 11:15:14.000000000 +0300
 @@ -4,9 +4,6 @@
  1
  1 Expected