summaryrefslogtreecommitdiff
path: root/sql-bench
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-09-12 03:14:13 +0300
committerunknown <monty@donna.mysql.com>2000-09-12 03:14:13 +0300
commitde04a97b613356f19bfbe67856cda64774865832 (patch)
treec167967c90129e2f7d3757c7e35b3ccd2668436e /sql-bench
parent2f6af71721a990b807ab07805a188b1f03b6d213 (diff)
parentfe4cccd6a43496395ec52e9043cd4350e5eac69d (diff)
downloadmariadb-git-de04a97b613356f19bfbe67856cda64774865832.tar.gz
Merge
sql/slave.cc: Auto merged sql/sql_parse.cc: Auto merged
Diffstat (limited to 'sql-bench')
-rwxr-xr-xsql-bench/crash-me.sh2
-rw-r--r--sql-bench/limits/mysql-3.23.cfg9
2 files changed, 7 insertions, 4 deletions
diff --git a/sql-bench/crash-me.sh b/sql-bench/crash-me.sh
index c86bcdccdaa..6357ffc17b1 100755
--- a/sql-bench/crash-me.sh
+++ b/sql-bench/crash-me.sh
@@ -39,7 +39,7 @@
# "3-byte int" or "same as xxx".
-$version="1.48";
+$version="1.49";
use DBI;
use Getopt::Long;
diff --git a/sql-bench/limits/mysql-3.23.cfg b/sql-bench/limits/mysql-3.23.cfg
index aebb879a574..fe724549bfb 100644
--- a/sql-bench/limits/mysql-3.23.cfg
+++ b/sql-bench/limits/mysql-3.23.cfg
@@ -1,4 +1,4 @@
-#This file is automaticly generated by crash-me 1.47
+#This file is automaticly generated by crash-me 1.48
NEG=yes # update of column= -column
Need_cast_for_null=no # Need to cast NULL for arithmetic
@@ -36,7 +36,7 @@ constraint_check=no # Column constraints
constraint_check_table=no # Table constraints
constraint_null=yes # NULL constraint (SyBase style)
crash_me_safe=no # crash me safe
-crash_me_version=1.47 # crash me version
+crash_me_version=1.48 # crash me version
create_default=yes # default value for column
create_default_func=no # default value function for column
create_if_not_exists=yes # create table if not exists
@@ -283,14 +283,17 @@ group_func_extra_count_distinct_list=yes # Group function COUNT(DISTINCT expr,ex
group_func_extra_std=yes # Group function STD
group_func_extra_stddev=yes # Group function STDDEV
group_func_extra_variance=no # Group function VARIANCE
+group_func_sql_any=no # Group function ANY
group_func_sql_avg=yes # Group function AVG
group_func_sql_count_*=yes # Group function COUNT (*)
group_func_sql_count_column=yes # Group function COUNT column name
group_func_sql_count_distinct=yes # Group function COUNT(DISTINCT expr)
+group_func_sql_every=no # Group function EVERY
group_func_sql_max=yes # Group function MAX on numbers
group_func_sql_max_str=yes # Group function MAX on strings
group_func_sql_min=yes # Group function MIN on numbers
group_func_sql_min_str=yes # Group function MIN on strings
+group_func_sql_some=no # Group function SOME
group_func_sql_sum=yes # Group function SUM
group_functions=yes # Group functions
has_true_false=no # TRUE and FALSE
@@ -384,7 +387,7 @@ select_limit2=yes # SELECT with LIMIT #,#
select_string_size=1048565 # constant string size in SELECT
select_table_update=no # Update with sub select
select_without_from=yes # SELECT without FROM
-server_version=MySQL 3.23.19 beta debug # server version
+server_version=MySQL 3.23.22 beta debug # server version
simple_joins=yes # ANSI SQL simple joins
storage_of_float=round # Storage of float values
subqueries=no # subqueries