Merge 5.1->5.1-rpl

Fix paths and name of a few files to make it work with new mtr.pl

1 files changed, 2 insertions, 3 deletions

diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test
index dff52ea4a0c..3ad3f394840 100644
--- a/mysql-test/t/ps_1general.test
+++ b/mysql-test/t/ps_1general.test
@@ -181,7 +181,7 @@ create table t5
   a int primary key,
   b char(30),
   c int,
-  d timestamp default current_timestamp
+  d timestamp default '2008-02-23 09:23:45'
 );
 insert into t5( a, b, c) values( 9, 'recreated table', 9);
 execute stmt2 ;
@@ -191,7 +191,7 @@ drop table t5 ;
 create table t5
 (
   a int primary key,
-  d timestamp default current_timestamp,
+  d timestamp default '2008-02-23 09:23:45',
   b char(30),
   c int
 );
@@ -218,7 +218,6 @@ create table t5
   f3 int
 );
 insert into t5( f1, f2, f3) values( 9, 'recreated table', 9);
---error 1054
 execute stmt2 ;
 drop table t5 ;