summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2007-02-17 12:57:46 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2007-02-17 12:57:46 +0000
commitb30e095dbef469f27484fc8d09877ae92ca68529 (patch)
treebb1e689d5ac4b37aacb9e4e3c2221d91db73c6c0
parentImported from /home/gentoo/distfiles/mysql-extras-20070108.tar.bz2. (diff)
downloadmysql-extras-20070217.tar.gz
mysql-extras-20070217.tar.bz2
mysql-extras-20070217.zip
Imported from /home/gentoo/distfiles/mysql-extras-20070217.tar.bz2.mysql-extras-20070217
-rw-r--r--000_index.txt10
-rw-r--r--702_all_trigger-rename-fail-as-root-5.0.34.patch35
2 files changed, 44 insertions, 1 deletions
diff --git a/000_index.txt b/000_index.txt
index c5d181b..52243e1 100644
--- a/000_index.txt
+++ b/000_index.txt
@@ -262,7 +262,15 @@
@@ normalize port 3306 in tests
@patch 702_all_trigger-rename-fail-as-root-5.0.26.patch
-@ver 5.00.26.00 to 5.00.99.99
+@ver 5.00.26.00 to 5.00.33.99
+@pn mysql
+@pn mysql-community
+@pn mysql-slotted
+@@ portage normally ran as root, MySQL tests are designed to be used
+@@ with lower priviledges
+
+@patch 702_all_trigger-rename-fail-as-root-5.0.34.patch
+@ver 5.00.34.00 to 5.00.99.99
@pn mysql
@pn mysql-community
@pn mysql-slotted
diff --git a/702_all_trigger-rename-fail-as-root-5.0.34.patch b/702_all_trigger-rename-fail-as-root-5.0.34.patch
new file mode 100644
index 0000000..e7d7832
--- /dev/null
+++ b/702_all_trigger-rename-fail-as-root-5.0.34.patch
@@ -0,0 +1,35 @@
+diff -ur mysql-5.0.orig/mysql-test/r/trigger.result mysql-5.0/mysql-test/r/trigger.result
+--- mysql-5.0.orig/mysql-test/r/trigger.result Mon Oct 9 15:22:07 2006
++++ mysql-5.0/mysql-test/r/trigger.result Tue Oct 10 11:59:22 2006
+@@ -969,7 +969,7 @@
+ test t1_bi test t1 set @a:=new.id
+ test t1_ai test t1 set @b:=new.id
+ rename table t1 to t2;
+-ERROR HY000: Can't create/write to file './test/t1_ai.TRN~' (Errcode: 13)
++ERROR HY000: Can't create/write to file './test/t1_ai.TRN~' (Errcode: 21)
+ insert into t1 values (102);
+ select @a, @b;
+ @a @b
+diff -ur mysql-5.0.orig/mysql-test/t/trigger.test mysql-5.0/mysql-test/t/trigger.test
+--- mysql-5.0.orig/mysql-test/t/trigger.test Mon Oct 9 15:22:07 2006
++++ mysql-5.0/mysql-test/t/trigger.test Tue Oct 10 11:58:55 2006
+@@ -1138,8 +1138,7 @@
+ event_object_table, action_statement from information_schema.triggers
+ where event_object_schema = 'test';
+ # Trick which makes update of second .TRN file impossible
+-system echo dummy >$MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
+-system chmod 000 $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
++system mkdir $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
+ --replace_result $MYSQLTEST_VARDIR . master-data/ ''
+ --error 1
+ rename table t1 to t2;
+@@ -1148,8 +1147,7 @@
+ select trigger_schema, trigger_name, event_object_schema,
+ event_object_table, action_statement from information_schema.triggers
+ where event_object_schema = 'test';
+-system chmod 600 $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
+-system rm $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
++system rmdir $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
+ # Let us check that updates to .TRN files were rolled back too
+ drop trigger t1_bi;
+ drop trigger t1_ai;