From: Bjorn Munch Date: January 11 2011 2:01pm Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2967) Bug#59002 List-Archive: http://lists.mysql.com/commits/128430 X-Bug: 59002 Message-Id: <201101111401.p0BE1SKh015474@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0327023905==" --===============0327023905== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/bm136801/my/lineno-51/ based on revid:bjorn.munch@stripped 2967 Bjorn Munch 2011-01-11 Bug #59002 Please make mtr print correct file and line number when tests fail Followup: had forgotten to update mysqltest.test due to changed output - duh! modified: mysql-test/r/mysqltest.result === modified file 'mysql-test/r/mysqltest.result' --- a/mysql-test/r/mysqltest.result 2011-01-11 09:54:42 +0000 +++ b/mysql-test/r/mysqltest.result 2011-01-11 14:00:21 +0000 @@ -318,8 +318,26 @@ drop table t1; mysqltest: At line 1: Error running query 'failing query': 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'failing query' at line 1 mysqltest: At line 1: Missing required argument 'filename' to command 'source' mysqltest: At line 1: Could not open './non_existingFile' for reading, errno: 2 -mysqltest: In included file "MYSQLTEST_VARDIR/tmp/recursive.sql": At line 1: Source directives are nesting too deep -mysqltest: In included file "MYSQLTEST_VARDIR/tmp/error.sql": At line 1: query 'garbage ' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +mysqltest: In included file "MYSQLTEST_VARDIR/tmp/recursive.sql": +included from MYSQLTEST_VARDIR/tmp/recursive.sql at line 1: +included from MYSQLTEST_VARDIR/tmp/recursive.sql at line 1: +included from MYSQLTEST_VARDIR/tmp/recursive.sql at line 1: +included from MYSQLTEST_VARDIR/tmp/recursive.sql at line 1: +included from MYSQLTEST_VARDIR/tmp/recursive.sql at line 1: +included from MYSQLTEST_VARDIR/tmp/recursive.sql at line 1: +included from MYSQLTEST_VARDIR/tmp/recursive.sql at line 1: +included from MYSQLTEST_VARDIR/tmp/recursive.sql at line 1: +included from MYSQLTEST_VARDIR/tmp/recursive.sql at line 1: +included from MYSQLTEST_VARDIR/tmp/recursive.sql at line 1: +included from MYSQLTEST_VARDIR/tmp/recursive.sql at line 1: +included from MYSQLTEST_VARDIR/tmp/recursive.sql at line 1: +included from MYSQLTEST_VARDIR/tmp/recursive.sql at line 1: +included from MYSQLTEST_VARDIR/tmp/recursive.sql at line 1: +included from MYSQLTEST_VARDIR/tmp/recursive.sql at line 1: +At line 1: Source directives are nesting too deep +mysqltest: In included file "MYSQLTEST_VARDIR/tmp/error.sql": +included from MYSQLTEST_VARDIR/tmp/error.sql at line 1: +At line 1: query 'garbage ' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 2 = outer loop variable after while here is the sourced script @@ -413,7 +431,9 @@ Beta is true while with string, only once 1 Testing while with not -mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest_while.inc": At line 64: Nesting too deeply +mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest_while.inc": +included from MYSQLTEST_VARDIR/tmp/mysqltest_while.inc at line 65: +At line 64: Nesting too deeply mysqltest: At line 1: missing '(' in while mysqltest: At line 1: missing ')' in while mysqltest: At line 1: Missing '{' after while. Found "dec $i" @@ -462,8 +482,12 @@ mysqltest: At line 1: query 'connect co mysqltest: At line 1: Illegal argument for port: 'illegal_port' mysqltest: At line 1: Illegal option to connect: SMTP 200 connects succeeded -mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 3: connection 'test_con1' not found in connection pool -mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 2: Connection test_con1 already exists +mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": +included from MYSQLTEST_VARDIR/tmp/mysqltest.sql at line 3: +At line 3: connection 'test_con1' not found in connection pool +mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": +included from MYSQLTEST_VARDIR/tmp/mysqltest.sql at line 2: +At line 2: Connection test_con1 already exists show tables; ERROR 3D000: No database selected connect con1,localhost,root,,; --===============0327023905== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/bjorn.munch@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: bjorn.munch@stripped # target_branch: file:///home/bm136801/my/lineno-51/ # testament_sha1: 44729ce3e2156c705850a4c310753facaa09636b # timestamp: 2011-01-11 15:01:28 +0100 # base_revision_id: bjorn.munch@stripped\ # jcxwvndbfi9z921s # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTie5YMAAlvfgEAQeOP//38n fSC////wUAWNp5bQbVyW7uqOqK1CSiaAETxT0amEPRMmRo0NBoNAAEpAmJ6jUwp4qflTxRtQeoAA yADQAkU0Cmieqe1T0nqbU8kYTRoNAADTTEA5piZMmjCYJiaYBMAhgjAjAJIhNJhoUwFPKY00k/Ip 6CPUNHpNB+qD0nSwDP349dys4IDChlFm6cRdsG2cElISiTMMMPtI6KPFmR9EfZ97r/Wrs2/fOxtU v1FaWzuWuogqxwanA9LYPcQf95CbIgLR1bWizN/dyEC7h4ZLgPJt7z8lX7IrasddqQkGHbI02RRA ouHAzBxWdZXgp8LupMy0XtT+47TIqOnf3cGOvZHB0LSqOfGiaHpdWHI8xURfIC+O8Ohsx3dVeVEK xIsTyYScdh2vjOPcAqfQBUJi+DHC94QFEc45yAipIyxScgOdd59DCSamUHJKMF5mss7sKw/FcRhm LwGw0c0CTEGCDBBXwk+FmM039nYnuNFhHdizaOaiBaKvcwz3xNIXZM9Th4W8wUiJITXhVAGMtuop syuM7h+ryQllSYjKY4aiwVK2NJUWVTC70iSC3Ar1ebgv2bBUO1MadL4Pc7QZQxFkgzQqayYObaJx FI462lJVBam8I5UxKeq+HNjzCs5GxVASOS6uZsKQtZhbpEM8MEnfGqxnCLTMhkKa6F0rUjStuDC/ kJVuhHcMe6c+YlixmO/wWTqH9DqBiUt8bMcYchOkJi4XuEuJG/ThRlR2zRprSRvkkTxjY5xjBWSd XQsFrPfp+Bf7bPdjBjLz480joArETZkx6cC/xAUugCq+gCojrEJ7zGNtJNh2CF1ALpAXPPtAVAE/ 5gKYC/0BdAFGgC2mxskN5anBg5cbcRqbm1pEOiUf0SE0IdJb489VNLYWXIZ+raP0Ic/A4ENqZS6Q 2C7NepKu8PdlBLMEppDnM4xvsy6cwr+FkdXxYy24bpoW7YS2wdIiAvmkYcSYTQj5gyJsCJjfIyy8 zfG+aqWT1xW87Ih39QCwKF52kyPnXZtcRdyOSBAv17KyvJ4cb2OJ+mSJCkAGQvb7RvFeIRaeaOcx lhcNGOM4iE0BygLKtdpw8O7uuLmHAacdTp1NLr5XmaMSA3ySyjndtzJcXwdwsvmiAyn7c9EVqQ6D iYG8qGOwtOoIi5+x7TswhYMvuYEN1RPqUWTBCd62BiFWEbZm7BpK7+VpZUZXipERjvhdKM2lMgvE tM0u0YeRnXiMi5IOQckhPIzdPbrlLawwU1B6WuAH2S/1QdeBIsKzEr1gYMxx80wggYEYXApngE0r Uhg9W3CFrs13d1sXV4BCwBZYY9zZkgdxxDbx7x1ZbK+hsr2AKqRm60j8PYeAR0IhAzW0ayHohjWR eSQyM0DGbJDgJncOsJOIVOVRENUzzWalJGoak1WcLk16rjWG9yk/9CQbAWYTDG3ygethGpWsMeqR EHD8gUyqKvu8P3r0Hpq49fEgXMvULdXkbUqG9rL3tlaV5ZbKiQMptoYSq+Y5OOmQHORU2G3dwAIo h3rDjQuua+GVCSSw1pBVK1SKwxAGdhlN25/ET6K5Y1/IMcO9ylNAMAPcqctLX6RI3gDiPcMhWha4 PeYY9rZ+GqEB0jbY925Wskpsk+gakb5OcjKqFo9slJPyHU7tmJcYBqAUxQCiy4PArdZFmhobMAE3 iLbRrdbMovO4kS7KIK3LfAHZHnUAEiqgez4wlCoX6Cq7i3rC7XxewMQjTSykLRzPI0lDUAYhPQXz K/8XckU4UJA4nuWD --===============0327023905==--