From: Dmitry Shulga Date: May 25 2011 4:44pm Subject: bzr commit into mysql-5.5 branch (Dmitry.Shulga:3404) Bug#11749345 List-Archive: http://lists.mysql.com/commits/138117 X-Bug: 11749345 Message-Id: <201105251644.p4PGiWhY010251@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3247449621220877955==" --===============3247449621220877955== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/shulga/projects/mysql/mysql-5.5/ based on revid:anitha.gopi@stripped 3404 Dmitry Shulga 2011-05-25 Follow-up for patch for bug#11749345. @ sql/sql_show.cc Restored DEBUG_SYNC point missed during merge 5.1->5.5 modified: sql/sql_show.cc === modified file 'sql/sql_show.cc' --- a/sql/sql_show.cc 2011-05-21 09:29:10 +0000 +++ b/sql/sql_show.cc 2011-05-25 16:44:08 +0000 @@ -3766,6 +3766,8 @@ int get_all_tables(THD *thd, TABLE_LIST continue; } + DEBUG_SYNC(thd, "before_open_in_get_all_tables"); + if (fill_schema_table_by_open(thd, FALSE, table, schema_table, db_name, table_name, --===============3247449621220877955== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/dmitry.shulga@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dmitry.shulga@stripped\ # ntcyhgfgat3of115 # target_branch: file:///Users/shulga/projects/mysql/mysql-5.5/ # testament_sha1: 527e799527c33a660af8d9fb6aaef5fc93f10897 # timestamp: 2011-05-25 23:44:26 +0700 # source_branch: file:///Users/shulga/projects/mysql/mysql-5.1-\ # bug11749345/ # base_revision_id: anitha.gopi@stripped\ # 02clhxzjvc2hapdp # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXwBGvQAAY1fgEBQWGf//1+B GiC////wUAPdeeqTu4kHQBoRDSnp5QaT2o9SepptTCaek0epk9T1NNDIc0xMACYAJgABMAATBlCY J6mmU0nimNQ0AaAAAADUxTJpGaho0aAAAABoAASSCCZomptNNGhMmIAKNpAejSepqeldZfKaQcKr JJAlI4AA+w68rUXEo6jY9c4iITcR4eYkyg08cS1etnT7SS3ldHFc7DKZ7kAbCfFgfDnWFHAyDkvP lnpVa+BFfwa9l+vXWLVX8LzX60yYnnsijMkR3KIr7HRjnzZydHozhmcsoJ6cIY8Uy09jhHo9A5yc D2HGC4jOo9MU0N7oHsxWawQ+g0a2gjSD1VNueHLwCYLWrDpTYjc0wsDwfi7VLpPoyTqCzLRVa7By mn/BtlAnagIitQvvwjpLiBLVAVXWAaolUDgXyc4unlWyRnSvSVcRaa751JKxFzXRnflZcJ8OSu0S jcDN1FDL82KJbe4l53xhoQS0SfYImXzZ1rdwNTPzqEjRhqrgKh81BWIzR5yZEOe8sqxvOcbzc1Dm YuUbdjDlbvmEQraBwxnAXOiwXCoI2UAsMaEGyZo+0C3FZsQymLppzraGEHFQEPxxxKjMyU10BLNp mtiBAtEU8bCNULQGvlvfvFWGba8laeGjczYW0ikmMjHyXIO46rbgxX4P0J/Bleofo+TqxqZznMjw 8YdyGb7PSZL64EfI+/ukZuGjpygWEwdeF1cKVnXXJHDqEzhsIHI7+09b8prVLbzDEPJjzWOvyLKj 0JA8b7Uz67cilmSNyoSLpkpLZTdusq3tJeEZJjWXYI7/cKxkB4FFJZllzuBFfkpWlrQ5c/tpqpae VHBgHjCYaFZu9YY6lF1TmwrKBFwz+8tBv4pibeGsjLNDJCifXvgv+y66gpVim2KImuhu7u1xGAxs mIEOhYSFn9ufc3TFW/wt5ArYmH+GKRaLVcLy3Ch0VPdzNuxOct4PTo194ppkejCaCwU60Yq47b/v oBp+ZoRg81Td4Soq7PnfhNeG8OdyZA/TcmXasSOcP6imWIUA9y+YIfLmUpDLXsWsB8FxnUl1PctM 8RwiTYKbXIqHeIyBS+hkU1ogsVY0qVKX8XtAao5MNh5K2xDgVFbJlE9rZvCwWH1qBUhtn2tYqz6S OQOZlmcu/Rk5GN3WGOtmTM8xWSpN7KtTtwWail+moCbtVNbZKtOSW9j2UUVcbSgxz0K3v0xtnmgw yTO7n3D2rOLUC8BbwdOam9/dp6NTnvUKilogzX3DJWwf0JWzRiKMrzbNUvH1fX2WEkVhQBBydjfl 2cAOOAZpo8vRVLatQZxeqcq1nSOPIUFz03mSh2f+LuSKcKEg+AI16A== --===============3247449621220877955==--