From: Mayank Prasad Date: March 14 2011 8:48am Subject: bzr commit into mysql-trunk branch (mayank.prasad:3757) Bug#11763174 List-Archive: http://lists.mysql.com/commits/132873 X-Bug: 11763174 Message-Id: <201103140848.p2E8mtqf018454@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0233161687==" --===============0233161687== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/mayank/mysql-server/trunk_IS/ based on revid:mayank.prasad@stripped 3757 Mayank Prasad 2011-03-14 bug #11763174: post-fix for previous push. @ mysql-test/suite/funcs_1/r/is_routines.result Modified test result to match the new expected output. modified: mysql-test/suite/funcs_1/r/is_routines.result === modified file 'mysql-test/suite/funcs_1/r/is_routines.result' --- a/mysql-test/suite/funcs_1/r/is_routines.result 2010-01-15 11:42:15 +0000 +++ b/mysql-test/suite/funcs_1/r/is_routines.result 2011-03-14 08:48:42 +0000 @@ -36,7 +36,7 @@ ROUTINE_TYPE varchar(9) NO DATA_TYPE varchar(64) NO CHARACTER_MAXIMUM_LENGTH int(21) YES NULL CHARACTER_OCTET_LENGTH int(21) YES NULL -NUMERIC_PRECISION int(21) YES NULL +NUMERIC_PRECISION bigint(21) unsigned YES NULL NUMERIC_SCALE int(21) YES NULL CHARACTER_SET_NAME varchar(64) YES NULL COLLATION_NAME varchar(64) YES NULL @@ -69,7 +69,7 @@ ROUTINES CREATE TEMPORARY TABLE `ROUTINE `DATA_TYPE` varchar(64) NOT NULL DEFAULT '', `CHARACTER_MAXIMUM_LENGTH` int(21) DEFAULT NULL, `CHARACTER_OCTET_LENGTH` int(21) DEFAULT NULL, - `NUMERIC_PRECISION` int(21) DEFAULT NULL, + `NUMERIC_PRECISION` bigint(21) unsigned DEFAULT NULL, `NUMERIC_SCALE` int(21) DEFAULT NULL, `CHARACTER_SET_NAME` varchar(64) DEFAULT NULL, `COLLATION_NAME` varchar(64) DEFAULT NULL, @@ -102,7 +102,7 @@ ROUTINE_TYPE varchar(9) NO DATA_TYPE varchar(64) NO CHARACTER_MAXIMUM_LENGTH int(21) YES NULL CHARACTER_OCTET_LENGTH int(21) YES NULL -NUMERIC_PRECISION int(21) YES NULL +NUMERIC_PRECISION bigint(21) unsigned YES NULL NUMERIC_SCALE int(21) YES NULL CHARACTER_SET_NAME varchar(64) YES NULL COLLATION_NAME varchar(64) YES NULL --===============0233161687== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/mayank.prasad@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mayank.prasad@stripped\ # r0u13av6ilnjp3sb # target_branch: file:///home/mayank/mysql-server/trunk_IS/ # testament_sha1: 385cb236c03a97e6b746ca1f1dd524226439d437 # timestamp: 2011-03-14 14:18:50 +0530 # base_revision_id: mayank.prasad@stripped\ # 5cagraeoyr2duhgm # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZqFK2EAAaRfgEAwWGf/938n 3iD////wUAQnjkUq2A0AGiNSAGj0gyMQAADQAAAHNMTJk0YTBMTTAJgEMEYEYBko9TCE2pqNHknl DQ000aAbUBk0NMgc0xMmTRhMExNMAmAQwRgRgEkggBME1PI00gZSG1PUNGnqaNDEekRYRcCCIXw5 Chm3zdiEEd0nqTywwEGhApSn30gPZHe1yjIzHPeQ8JGNlBtEJZoaG6IuVfd7sfGvsh9yMv0vEr24 gaY/t+yvwfTh2nmMwsYpu3NdYL6CKKVdDVsfksL5RZfTwWE8aKBE02gjNGEbJZH376cZkdGGaLOd WrIuEOf0gnIIphlHpIrhMyit54EHlVoqgJ18uUu0yAwVCvHjaQKTCLseWuYZIW1XtoLAdZ9Jk2TY FrLGx4bojXvRBra4T2LYHKWiyitkBIHzlQWXEHJcVV+C3ilnwmqDPPhFcCjjOTMnCrTCp2IJycsc X8WIVcnFf1lqF26CwsUEDhqhNq2o7pnvJBXO1rn3tzdQSZWrr9enhgNTYM3O1VRgy03urder+EvD bGaSxSqlZbmsK+RukpAQKJA91gLqNwuvCMVQfBKRQoc+CxlkvKchg+R9CKuFwniiqGq9kYEnLc41 ngt9EaPezpjIovMK1c1Zc6qD4NJPo0r3AwxNI9QdM5zDpglmY/I7Nq5W1sXj6OBFupkqFBqA+TOv 4fr7O0NU2Hu1nOdpOUbBqFF8aFpVCj6qxEAp+a9WVJ5HttWRrs5G0nuZEFPugvvb7eZOvSP67yBE 5IZEYggHmfH2NMxvs0EjPMRGSMp9TGlIK+oENbZMMZlZ2TtDQWyrI0iEVpXDDuPEChGqhsJdebJR zbnyZhHokVwJ1Bgwsptnh7551D0mT8yWKpEXnsUB/M0wldYra+jJGDbWfPc/k/oRNjrJTxKXNSTh NU129Vy3T48HQ3WNyn+DpINtI7qdUy4LLKrmX2IupIppxasiPdFdkmK0wHLw7MOMmqYNx8BvXv72 t1qV49Qxb9/d3Lx5C0sXdFOUFvNeLnA6mKnVW7vvRLmwWF+FwNlHmuKtWqijuFOpTO0HIsp2Xx45 RrDv6zLk8My723zdb0tWEM0Fp5T6B8YB8ygGoevXDtKxDLu31PFO4U0qlhrzAjdxDhS8ahhCRcDg 9HqJQplzSRyGxiwTEgslgRChRciLEuStFMkTBFZIZky02g7qt/4ZaApg8nkv1EUA5f4vN6bCaVGH 3WrTEP+FHRmCBVRTHHyEOl/F27Oo46U+HPUV54poiNkwTfC8RQiy5D7vGBQWUK50rIeoNBlg9Ga5 EeCK0jE9gvKbcUNvav7FQDqVNSuubTZlSuaZMQCSd4u2E9vAsTJzrXSsow1HnCF0Gxns7MXuGlc1 z1luNyJKwsT2hFykVXbn0F5w078XKsnnckxTYr4W1jCouE69WreLqp7a1AKxmnSLqF3j5ST/xdyR ThQkJqFK2EA= --===============0233161687==--