diff options
author | unknown <monty@hundin.mysql.fi> | 2002-08-08 20:49:06 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2002-08-08 20:49:06 +0300 |
commit | 33dab613c7ede7c9d3b7d39252ab29c5ff3b4165 (patch) | |
tree | 3a864bb27bc717c690f6d83d2aa5afbc850401a4 /mysql-test/r/olap.result | |
parent | 028cfaba9ba0fcbba30511e6951daab6a1829f20 (diff) | |
download | mariadb-git-33dab613c7ede7c9d3b7d39252ab29c5ff3b4165.tar.gz |
Added nety_retry_count as a changeable variable
Make safe_mysqld a symlink to mysqld_safe in binary distribution
Fixed problem with CTRL-C when using mysqld --bootstrap
Docs/manual.texi:
Added nety_retry_count as a changeable variables
include/mysql_com.h:
Added nety_retry_count as a changeable variables
libmysql/libmysql.c:
Added nety_retry_count as a changeable variables
mysql-test/r/olap.result:
Fixed wrong error message
mysql-test/r/variables.result:
Update for freebsd
mysql-test/t/variables.test:
Update for freebsd
scripts/make_binary_distribution.sh:
Make safe_mysqld a symlink to mysqld_safe in binary distribution.
sql/item_func.cc:
Cleaned up tmp_table_field() handling.
sql/item_func.h:
Cleaned up tmp_table_field() handling.
sql/item_strfunc.h:
Cleaned up tmp_table_field() handling.
sql/item_timefunc.h:
Cleaned up tmp_table_field() handling.
sql/mysql_priv.h:
Added nety_retry_count as a changeable variables
sql/mysqld.cc:
Added nety_retry_count as a changeable variables
Allow one to specify a defaults file to be read when installing MySQL as a service.
sql/net_pkg.cc:
Added nety_retry_count as a changeable variables
sql/net_serv.cc:
Added nety_retry_count as a changeable variables
sql/set_var.cc:
Added nety_retry_count as a changeable variables
sql/share/czech/errmsg.txt:
Fixed wrong error message
sql/share/danish/errmsg.txt:
Fixed wrong error message
sql/share/english/errmsg.txt:
Fixed wrong error message
sql/share/estonian/errmsg.txt:
Fixed wrong error message
sql/share/french/errmsg.txt:
Fixed wrong error message
sql/share/german/errmsg.txt:
Fixed wrong error message
sql/share/greek/errmsg.txt:
Fixed wrong error message
sql/share/hungarian/errmsg.txt:
Fixed wrong error message
sql/share/italian/errmsg.txt:
Fixed wrong error message
sql/share/japanese/errmsg.txt:
Fixed wrong error message
sql/share/korean/errmsg.txt:
Fixed wrong error message
sql/share/norwegian-ny/errmsg.txt:
Fixed wrong error message
sql/share/norwegian/errmsg.txt:
Fixed wrong error message
sql/share/polish/errmsg.txt:
Fixed wrong error message
sql/share/portuguese/errmsg.txt:
Fixed wrong error message
sql/share/romanian/errmsg.txt:
Fixed wrong error message
sql/share/russian/errmsg.txt:
Fixed wrong error message
sql/share/slovak/errmsg.txt:
Fixed wrong error message
sql/share/spanish/errmsg.txt:
Fixed wrong error message
sql/share/swedish/errmsg.txt:
Fixed wrong error message
sql/share/ukrainian/errmsg.txt:
Fixed wrong error message
sql/sql_class.cc:
Indentaion cleanup
sql/sql_class.h:
Fixed wrong error message
sql/sql_parse.cc:
Fixed problem with CTRL-C when using mysqld --bootstrap
sql/sql_select.cc:
Ensure that select terminates if create_myisam_from_heap() fails.
sql/sql_yacc.yy:
Portability fix
Diffstat (limited to 'mysql-test/r/olap.result')
-rw-r--r-- | mysql-test/r/olap.result | 10 |
1 files changed, 5 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; |