Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
unknown authored
into  mysql.com:/usr/home/ram/work/bug23254/my50-bug23254
409dcbd6