[gentoo-commits] proj/mysql-extras:master commit in: /

[Robin H. Johnson]

commit:     bb11ef195710b977eb2165bd8600a83c4cc88e7d
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Thu Aug  2 19:13:06 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Aug  2 19:13:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=bb11ef19

Patch to fix unit tests that randomly fail on ma_test2 binary.  Bugs #41001 #423467

---
 00000_index.txt                   |    5 +++++
 20000_all_mariadb_fix_tests.patch |   20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/00000_index.txt b/00000_index.txt
index ad79cd7..59e6c46 100644
--- a/00000_index.txt
+++ b/00000_index.txt
@@ -1410,3 +1410,8 @@
 @ver 5.02.07.00 to 5.03.99.99
 @pn mariadb
 @@ Fix duplicate entries for files on support-files/Makefile.am
+
+@patch 20000_all_mariadb_fix_tests.patch
+@ver 5.01.00.00 to 5.03.99.99
+@pn mariadb
+@@ Fix bad index in the ma_test2 unit test binary

diff --git a/20000_all_mariadb_fix_tests.patch b/20000_all_mariadb_fix_tests.patch
new file mode 100644
index 0000000..e5959c0
--- /dev/null
+++ b/20000_all_mariadb_fix_tests.patch
@@ -0,0 +1,20 @@
+--- mysql/storage/maria/ma_test2.c	2012-04-05 06:48:45.000000000 -0400
++++ mysql.new/storage/maria/ma_test2.c	2012-04-25 10:08:30.768603663 -0400
+@@ -259,7 +259,7 @@
+   for (i=0 ; i < recant ; i++)
+   {
+     ulong blob_length;
+-    n1=rnd(1000); n2=rnd(100); n3=rnd(5000);
++    n1=rnd(1000); n2=rnd(100); n3=rnd(4999);
+     sprintf((char*) record,"%6d:%4d:%8d:Pos: %4d    ",n1,n2,n3,write_count);
+     int4store(record+STANDARD_LENGTH-4,(long) i);
+     fix_length(record,(uint) STANDARD_LENGTH+rnd(60));
+@@ -374,7 +374,7 @@
+ 
+   for (i=0 ; i < update_count ; i++)
+   {
+-    n1=rnd(1000); n2=rnd(100); n3=rnd(5000);
++    n1=rnd(1000); n2=rnd(100); n3=rnd(4999);
+     sprintf((char*) record2,"%6d:%4d:%8d:XXX: %4d     ",n1,n2,n3,update);
+     int4store(record2+STANDARD_LENGTH-4,(long) i);
+     fix_length(record2,(uint) STANDARD_LENGTH+rnd(60));