From: Mikael Ronstrom Date: December 2 2009 11:49am Subject: bzr push into mysql-5.5-trunk-bugfixing branch (mikael:2909 to 2910) Bug#49180 List-Archive: http://lists.mysql.com/commits/92436 X-Bug: 49180 Message-Id: <200912021149.nB2BnZdq024425@dator6.liljeholmen.mysql.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6379497251996080563==" --===============6379497251996080563== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 2910 Mikael Ronstrom 2009-12-02 BUG#49180, fixed MAXVALUE problem modified: mysql-test/r/partition_column.result mysql-test/t/partition_column.test sql/partition_info.cc 2909 Alexey Botchkov 2009-11-25 Bug#48878 "Embedded" tests fail due to an unknown variable "shared-memory-base-name" the 'shared-memory-base-name' was added to the [client] section of the my.cnf file. That option isn't supported by the mysqltest_embedded. per-file comments: mysql-test/lib/My/ConfigFactory.pm modified: mysql-test/lib/My/ConfigFactory.pm === modified file 'mysql-test/r/partition_column.result' --- a/mysql-test/r/partition_column.result 2009-11-10 08:34:26 +0000 +++ b/mysql-test/r/partition_column.result 2009-12-02 07:14:22 +0000 @@ -1,4 +1,14 @@ drop table if exists t1; +create table t1 (a int, b int) +partition by range columns (a,b) +( partition p0 values less than (maxvalue, 10), +partition p1 values less than (maxvalue, maxvalue)); +ERROR HY000: VALUES LESS THAN value must be strictly increasing for each partition +create table t1 (a int, b int, c int) +partition by range columns (a,b,c) +( partition p0 values less than (1, maxvalue, 10), +partition p1 values less than (1, maxvalue, maxvalue)); +ERROR HY000: VALUES LESS THAN value must be strictly increasing for each partition create table t1 (a varchar(1) character set latin1 collate latin1_general_ci) partition by range columns(a) ( partition p0 values less than ('a'), @@ -89,7 +99,7 @@ subpartition by hash (to_seconds(d)) subpartitions 4 ( partition p0 values less than (1, '0', MAXVALUE, '1900-01-01'), partition p1 values less than (1, 'a', MAXVALUE, '1999-01-01'), -partition p2 values less than (1, 'a', MAXVALUE, MAXVALUE), +partition p2 values less than (1, 'b', MAXVALUE, MAXVALUE), partition p3 values less than (1, MAXVALUE, MAXVALUE, MAXVALUE)); select partition_method, partition_expression, partition_description from information_schema.partitions where table_name = "t1"; @@ -102,10 +112,10 @@ RANGE COLUMNS a,b,c,d 1,'a',MAXVALUE,'19 RANGE COLUMNS a,b,c,d 1,'a',MAXVALUE,'1999-01-01' RANGE COLUMNS a,b,c,d 1,'a',MAXVALUE,'1999-01-01' RANGE COLUMNS a,b,c,d 1,'a',MAXVALUE,'1999-01-01' -RANGE COLUMNS a,b,c,d 1,'a',MAXVALUE,MAXVALUE -RANGE COLUMNS a,b,c,d 1,'a',MAXVALUE,MAXVALUE -RANGE COLUMNS a,b,c,d 1,'a',MAXVALUE,MAXVALUE -RANGE COLUMNS a,b,c,d 1,'a',MAXVALUE,MAXVALUE +RANGE COLUMNS a,b,c,d 1,'b',MAXVALUE,MAXVALUE +RANGE COLUMNS a,b,c,d 1,'b',MAXVALUE,MAXVALUE +RANGE COLUMNS a,b,c,d 1,'b',MAXVALUE,MAXVALUE +RANGE COLUMNS a,b,c,d 1,'b',MAXVALUE,MAXVALUE RANGE COLUMNS a,b,c,d 1,MAXVALUE,MAXVALUE,MAXVALUE RANGE COLUMNS a,b,c,d 1,MAXVALUE,MAXVALUE,MAXVALUE RANGE COLUMNS a,b,c,d 1,MAXVALUE,MAXVALUE,MAXVALUE @@ -123,7 +133,7 @@ SUBPARTITION BY HASH (to_seconds(d)) SUBPARTITIONS 4 (PARTITION p0 VALUES LESS THAN (1,'0',MAXVALUE,'1900-01-01') ENGINE = MyISAM, PARTITION p1 VALUES LESS THAN (1,'a',MAXVALUE,'1999-01-01') ENGINE = MyISAM, - PARTITION p2 VALUES LESS THAN (1,'a',MAXVALUE,MAXVALUE) ENGINE = MyISAM, + PARTITION p2 VALUES LESS THAN (1,'b',MAXVALUE,MAXVALUE) ENGINE = MyISAM, PARTITION p3 VALUES LESS THAN (1,MAXVALUE,MAXVALUE,MAXVALUE) ENGINE = MyISAM) */ drop table t1; create table t1 (a int, b int) === modified file 'mysql-test/t/partition_column.test' --- a/mysql-test/t/partition_column.test 2009-11-06 10:49:27 +0000 +++ b/mysql-test/t/partition_column.test 2009-12-02 07:14:22 +0000 @@ -9,6 +9,21 @@ drop table if exists t1; --enable_warnings # +# BUG#49180, Possible to define empty intervals for column list partitioning +# +--error ER_RANGE_NOT_INCREASING_ERROR +create table t1 (a int, b int) +partition by range columns (a,b) +( partition p0 values less than (maxvalue, 10), + partition p1 values less than (maxvalue, maxvalue)); + +--error ER_RANGE_NOT_INCREASING_ERROR +create table t1 (a int, b int, c int) +partition by range columns (a,b,c) +( partition p0 values less than (1, maxvalue, 10), + partition p1 values less than (1, maxvalue, maxvalue)); + +# # BUG#48161, Delivering too few records using collate syntax with partitions # # Test case from BUG#48447 with some extension @@ -78,7 +93,7 @@ subpartition by hash (to_seconds(d)) subpartitions 4 ( partition p0 values less than (1, '0', MAXVALUE, '1900-01-01'), partition p1 values less than (1, 'a', MAXVALUE, '1999-01-01'), - partition p2 values less than (1, 'a', MAXVALUE, MAXVALUE), + partition p2 values less than (1, 'b', MAXVALUE, MAXVALUE), partition p3 values less than (1, MAXVALUE, MAXVALUE, MAXVALUE)); select partition_method, partition_expression, partition_description from information_schema.partitions where table_name = "t1"; === modified file 'sql/partition_info.cc' --- a/sql/partition_info.cc 2009-11-10 09:32:29 +0000 +++ b/sql/partition_info.cc 2009-12-02 07:14:22 +0000 @@ -801,7 +801,7 @@ int partition_info::compare_column_value if (first->max_value || second->max_value) { if (first->max_value && second->max_value) - continue; + return 0; if (second->max_value) return -1; else --===============6379497251996080563== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/mikael@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mikael@stripped # target_branch: file:///home/mikael/mysql_clones/mysql-trunk-\ # bug49180/ # testament_sha1: 3c1874700070e9564fb6c25786769a17f29adf9b # timestamp: 2009-12-02 12:49:35 +0100 # base_revision_id: holyfoot@stripped # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVgvzO8AA6hfgEQwWef//3rn 32C////wYAevqAAAD32HIAAKAeEkpkU9JtTyjI9R6npNoQBhNDTTI0MgADjJk00wmRkDAjE0YIwg 0aYABDjJk00wmRkDAjE0YIwg0aYABBqeooAyABkyAA0DQDIAAAGSoDRoDRpoGgANAyANDQAaASSA gIwmjQCZAmVP1NJ5JiMIbNQT9FJocoYQtE9FO7Vp49qd6rQGqnwbvLcEIxPDVaCu+uogZObLTVOi NpoWFIl8KmveKvo1mOp/WEqbiOmVwYkTNRhqeSixxB7gzgqDQpQZMyGZOPNJzfEBE6sF0FDS9+rX F7pyhqlGLpaouc90WJM2zcwZfwbTmuy4PTa71isfQgGRrBxX1B/a8evo0eHcfvyL5nyOZ8gcPjQI tqArIxUAOjFr16nvDvWG+kJL1YrEMK0Qw6w1nM5jDHf4tf5dsIm64z8W8L56VCyp8uqB2ji8EdV/ k8tvJJjkiIOBFpAtvDfaDFoeAfowtZEInwJTE0AigiiKOoFQqwtPT0oZq/4OgYgGxef2beFR9w3C vqeR7pjxD9JX5bY+cDwGQnDhcw/B3nyT2GTUaq86ARmEYB0IP2No9SThmBDPIDniHFROoYlAk88B 5AhCYjif0Iha/MadBQOBEQZRCknbJ5AkbuZGgoPdZtLSgsAk1W8HA8qxCR9gvvBvYuKEVUjsHO44 Dk8iL9H62eIyWtSX94w1Wasc7FMais8Ah1EMWNAsKy0vIRwO8RR/qK0HbRHQ/QG1TGWJuLrsi+uj jSokRFu9JExEhDJihIcpOktQ4udFaxjKNpa+kfOmkoFSWqskRNh/Vm0xVync1LtBLQGmS0kSqBdS XUD+0oNeJgMn4DWtSfX3admPwoSMNN941sHWi5GkhqMopG9jW0q7vEnUYlhD8S9/ZSUGwLjI0j7T H2I3vvjtMC81kl+FBcxboLzv3bTfkcZEywvGrPreWkzV6RzplTU5wzig4mwePsMXOJGygulA6vsL kYGgsC3v71Mu0ki8tNN4jUOe86ukfm3CIiRRlvxRoKi0FdQ+mDPZy1JxDEhwjHAqHRJzNxGuLiQO yrqviG42zeCHUqgm7nF1RsHGklpLS0maTQNoxxeYEy0Yq2lp5ahxeWMrxpYuHOCtD4BeKPxIMcCo 6IBAG0ijftIhgyA4Ull1BQokFAZ4AZbaoKRCKVWxHKAjOHwQOHYvA+twdJKoXKFAi9CHAA5B8BHg ckVFEfoOHEF/SkOJoPZRJkdJDY0V/Ig9gb5g9mBkVBm+EWPZMK5xYYh7A/ALikpDAKCZIKQqYnQD lcqoj1FPlUYCD/AwfRJSVCSzMjUVlRyQZnFMOTCc7l+TzcyPkB8wgB9qi6TCYjTWCIkL8eMdd7uZ CzERiE8yfyBZZwlsiNZDZpgQSmRMGeAFw3Q+UsQGcoIzVmKCxIOIm44J5QfmWj7w2f99dVhxOUKQ +IkxjytyFaXGkhgPODzE/IqPX8iZ851lOu/nB6tL/wEwWIBmKDEJE5l/QxB5+qnExNIVIgi8d4lZ 4FoisgG4ulvCnI4fsbz9g0blI4Dg2A0kQBOTlwJbDnoMzIo2Tu0eQ9vAHk9lzlSEBZHjzFwKBjsK D5aol/XzyKu6v7OzNCwvmv7Jkp68uHDI7AhAQxM6m2wRuIpo0skVKCUo6/lzVA5PYtw5GJM5hxBx cGH8rvWwLW3GPQNygKjhf3KSbjv7IBv1AO7OeVX08+wieNa8G5gdRDsI9zidwjckTJvoa7dweeYi Z3hwuP994LWIkcVvE+6paNJJI+HST6RRYQyGEyZM3ERqEaHiFb5WzUfNe/kdS7PaO2pL+S3PWKo4 6KnoByNzwX2lS5oZWsDtgis7RzZs3WwygAu5I215uHr0YQWS09FajmzMzNAPXswPbugd6GW+7Rkk eFdAbDTdG4v+f1SXU4FpYIxrei5hHvuHieILA9KKEEyLknoqfGjDOusJUiL0zJmSZeReNRuZbyik 7T0IJHuUHCCpIDNvxpUUmVQmXucv3uDt+4RmpG0DxEy+KxcHTu6oee8GQzMzQ7hmVQ/BGEwTX3Eu 8XHR15Rnv16dyliykFySot27CL2C8nilgHPUKUxH3r6699C2Mn2bhDU4mha8+WqJJwXnSkLxCqcT ZyqD0eIzEMHcI+1OmM3HdItkI6T7BwXBLQViHrssR0DNtfQQWAsdhU8LRbTL4kPMjdetjTESwpC8 +HbRSaVSqvATUg3gSCFUuqpKBMwidPIeYCE4Qn9pCwVKfrHj2c4kyHk7+ET4COGfp4lwl72Ee7yE d+iCQxW2ezvN1hLWbgTCMlUYXahHpmSLMuhJTW4RVu6G82iJpZAsJmRtB7vi6+K2K8QPHU4FVgaV fKmk3lO5VUr+LuSKcKEgsF+Z3g== --===============6379497251996080563==--