The problem is that the Table_locks_waited was incremented only
when the lock request succeed. If a thread waiting for the lock
gets killed or the lock request is aborted, the variable would
not be incremented, leading to inaccurate values in the variable.

The solution is to increment the Table_locks_waited whenever the
lock request is queued. This reflects better the intended behavior
of the variable -- show how many times a lock was waited.

into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt

into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-5.0-rt

into  quad.:/mnt/raid/alik/MySQL/devel/5.0-rt-merged-5.0

into  kaamos.(none):/data/src/opt/mysql-5.1-opt

into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-33618

into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-33618

Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted)

The server used to crash when REPEAT or another control instruction
was used in conjunction with labels and a LEAVE instruction.

The crash was caused by a missing "pop" of handlers or cursors in the
code representing the stored program. When executing the code in a loop,
this missing "pop" would result in a stack overflow, corrupting memory.

Code generation has been fixed to produce the missing h_pop/c_pop
instructions.

Also, the logic checking that labels at the beginning and the end of a
statement are matched was incorrect, causing Bug 33983.
End labels, when used, must match the label used at the beginning of a block.

into  kaamos.(none):/data/src/opt/mysql-5.1-opt

of cleanups in the test case for bug33794.

into  ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-merged-5.0-rt

into  ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-merged-5.1

into  ibm.:/home/alik/Documents/MySQL/devel/5.0-rt-merged-5.0

into  kaamos.(none):/data/src/opt/mysql-5.1-opt

into  lamia.dupka:/home/mhansson/my50-bug33143-again-pushee

The problem occurred when one had a subquery that had an equality X=Y where 
Y referred to a named select list expression from the parent select. MySQL 
crashed when trying to use the X=Y equality for ref-based access. 

Fixed by allowing non-Item_field items in the described case.

into  linux-st28.site:/home/martin/mysql/src/bug33143/my51-bug33143-pushee

into  linux-st28.site:/home/martin/mysql/src/bug33143/my51-bug33143

into  linux-st28.site:/home/martin/mysql/src/bug33143/my50-bug33143-again-pushee

The ROUND(X, D) function would change the Item::decimals field during
execution to achieve the effect of a dynamic number of decimal digits.
This caused a series of bugs:
Bug #30617:Round() function not working under some circumstances in InnoDB
Bug #33402:ROUND with decimal and non-constant cannot round to 0 decimal places
Bug #30889:filesort and order by with float/numeric crashes server
Fixed by never changing the number of shown digits for DECIMAL when
used with a nonconstant number of decimal digits.

into  lamia.dupka:/home/mhansson/my50-bug31797-pushee

into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime

Use compiler provided atomic builtins as a 'backend' for
MySQL's atomic primitives. The builtins are available on
a handful of platforms and compilers.

into  lamia.dupka:/home/mhansson/my51-bug31797-pushee

into  linux-st28.site:/home/martin/mysql/src/bug31797/my51-bug31797-pushee

into  linux-st28.site:/home/martin/mysql/src/bug31797/my51-bug31797

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug33697

When the function test_if_skip_sort_order prefers index backward scan 
to ref access the corresponding access functions must be set accordingly.

into  linux-st28.site:/home/martin/mysql/src/bug31797/my50-bug31797-pushee

The name resolution for correlated subqueries and HAVING clauses
failed to distinguish which of two was being performed when there 
was a reference to an outer aliased field.
Fixed by adding the condition that HAVING clause name resulotion
is being performed.

into  host.loc:/home/uchum/work/5.1-opt