Merge lp:~vkolesnikov/maria/maria-pbxt-preload-test-bug into lp:maria/5.1

[Vladimir Kolesnikov]

fixed the problem for the failing preload.test in pbxt suite

[Michael Widenius (monty)]

Hi!

>>>>> "Vladimir" == Vladimir Kolesnikov <email address hidden> writes:

Vladimir> Vladimir Kolesnikov has proposed merging lp:~vkolesnikov/maria/maria-pbxt-preload-test-bug into lp:maria/5.1.
Vladimir> Requested reviews:
Vladimir> Maria-captains (maria-captains)

Vladimir> For more details, see:
Vladimir> https://code.launchpad.net/~vkolesnikov/maria/maria-pbxt-preload-test-bug/+merge/56970

Vladimir> fixed the problem for the failing preload.test in pbxt suite
Vladimir> --
Vladimir> https://code.launchpad.net/~vkolesnikov/maria/maria-pbxt-preload-test-bug/+merge/56970
Vladimir> Your team Maria-captains is requested to review the proposed merge of lp:~vkolesnikov/maria/maria-pbxt-preload-test-bug into lp:maria/5.1.

Thanks!

This has unfortunatly wait until after the MySQL conference.
I will however do my best to merge this as soon as I am back!

Regards,
Monty

[Kristian Nielsen (knielsen)]

Michael Widenius <email address hidden> writes:

>>>>>> "Vladimir" == Vladimir Kolesnikov <email address hidden> writes:
>
> Vladimir> Vladimir Kolesnikov has proposed merging lp:~vkolesnikov/maria/maria-pbxt-preload-test-bug into lp:maria/5.1.
> Vladimir> Requested reviews:
> Vladimir> Maria-captains (maria-captains)
>
> Vladimir> For more details, see:
> Vladimir> https://code.launchpad.net/~vkolesnikov/maria/maria-pbxt-preload-test-bug/+merge/56970
>
> Vladimir> fixed the problem for the failing preload.test in pbxt suite

> This has unfortunatly wait until after the MySQL conference.
> I will however do my best to merge this as soon as I am back!

I merged the patch into mariadb 5.1, thanks Vladimir!

 - Kristian.

=== modified file 'storage/pbxt/src/lock_xt.cc'
--- storage/pbxt/src/lock_xt.cc	2011-02-23 09:22:56 +0000
+++ storage/pbxt/src/lock_xt.cc	2011-04-08 15:29:29 +0000
@@ -1424,6 +1424,7 @@
 #endif
 {
 	sxs->sxs_xlocked = 0;
+	sxs->sxs_xwaiter = 0;
 	sxs->sxs_rlock_count = 0;
 	sxs->sxs_wait_count = 0;
 #ifdef DEBUG