diff options
| author | monty@hundin.mysql.fi <> | 2002-08-08 21:09:31 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-08-08 21:09:31 +0300 |
| commit | c46ec25eaf923a6130adcf4c3f5cae8de72db3b6 (patch) | |
| tree | 910bd39bfd7945c4a19b5d91b131d9dacbba656c /mysql-test | |
| parent | fff61924c736c3da2700a272bc3207565687ed66 (diff) | |
| parent | 8832927d5c843084664e4ec861f5ebb82d424ed8 (diff) | |
| download | mariadb-git-c46ec25eaf923a6130adcf4c3f5cae8de72db3b6.tar.gz | |
Reverted wrong patch for CREATE TABLE .. SELECT
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/olap.result | 10 | ||||
| -rw-r--r-- | mysql-test/r/variables.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/variables.test | 1 |
3 files changed, 7 insertions, 5 deletions
diff --git a/mysql-test/r/olap.result b/mysql-test/r/olap.result index fa6008e99f7..52bd83df5ed 100644 --- a/mysql-test/r/olap.result +++ b/mysql-test/r/olap.result @@ -15,13 +15,13 @@ insert into sales values ( 'Computer', 'India',2000, 1200), ( 'Computer', 'United States', 2000,1500), ( 'Calculator', 'United States', 2000,75); select product, country , year, sum(profit) from sales group by product, country, year with cube; -This version of MySQL doesn't yet support 'CUBE', +This version of MySQL doesn't yet support 'CUBE' explain select product, country , year, sum(profit) from sales group by product, country, year with cube; -This version of MySQL doesn't yet support 'CUBE', +This version of MySQL doesn't yet support 'CUBE' select product, country , year, sum(profit) from sales group by product, country, year with rollup; -This version of MySQL doesn't yet support 'ROLLUP', +This version of MySQL doesn't yet support 'ROLLUP' explain select product, country , year, sum(profit) from sales group by product, country, year with rollup; -This version of MySQL doesn't yet support 'ROLLUP', +This version of MySQL doesn't yet support 'ROLLUP' select product, country , year, sum(profit) from sales group by product, country, year with cube union all select product, country , year, sum(profit) from sales group by product, country, year with rollup; -This version of MySQL doesn't yet support 'CUBE', +This version of MySQL doesn't yet support 'CUBE' drop table sales; diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 4227ecfdadb..2896636a37c 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -120,6 +120,7 @@ set myisam_max_sort_file_size=default; show variables like 'myisam_max_sort_file_size'; Variable_name Value myisam_max_sort_file_size 20000 +set global net_retry_count=10, session net_retry_count=10; set global net_buffer_length=1024, net_write_timeout=200, net_read_timeout=300; set session net_buffer_length=2048, net_write_timeout=500, net_read_timeout=600; show global variables like 'net_%'; diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 967c21f7eab..ecc4a0cbcdc 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -73,6 +73,7 @@ show global variables like 'myisam_max_sort_file_size'; set myisam_max_sort_file_size=default; show variables like 'myisam_max_sort_file_size'; +set global net_retry_count=10, session net_retry_count=10; set global net_buffer_length=1024, net_write_timeout=200, net_read_timeout=300; set session net_buffer_length=2048, net_write_timeout=500, net_read_timeout=600; show global variables like 'net_%'; |