mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02:00
Merge 192.168.0.10:mysql/mysql-4.1-maint
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint mysys/default.c: Auto merged sql/mysqld.cc: Auto merged sql/sql_prepare.cc: Auto merged
This commit is contained in:
unknown
commit
31aee856d8
35 changed files with 369 additions and 88 deletions
|
|
@ -301,6 +301,8 @@ our %mysqld_variables;
|
|||
|
||||
my $source_dist= 0;
|
||||
|
||||
our $opt_max_save_core= 5;
|
||||
my $num_saved_cores= 0; # Number of core files saved in vardir/log/ so far.
|
||||
|
||||
######################################################################
|
||||
#
|
||||
|
|
@ -589,6 +591,7 @@ sub command_line_setup () {
|
|||
'strace-client' => \$opt_strace_client,
|
||||
'master-binary=s' => \$exe_master_mysqld,
|
||||
'slave-binary=s' => \$exe_slave_mysqld,
|
||||
'max-save-core=i' => \$opt_max_save_core,
|
||||
|
||||
# Coverage, profiling etc
|
||||
'gcov' => \$opt_gcov,
|
||||
|
|
@ -3301,10 +3304,12 @@ sub save_files_before_restore($$) {
|
|||
# Look for core files
|
||||
foreach my $core_file ( glob("$data_dir/core*") )
|
||||
{
|
||||
last if $opt_max_save_core > 0 && $num_saved_cores >= $opt_max_save_core;
|
||||
my $core_name= basename($core_file);
|
||||
mtr_report("Saving $core_name");
|
||||
mkdir($save_name) if ! -d $save_name;
|
||||
rename("$core_file", "$save_name/$core_name");
|
||||
++$num_saved_cores;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -4897,6 +4902,9 @@ Options for debugging the product
|
|||
master-binary=PATH Specify the master "mysqld" to use
|
||||
slave-binary=PATH Specify the slave "mysqld" to use
|
||||
strace-client Create strace output for mysqltest client
|
||||
max-save-core Limit the number of core files saved (to avoid filling
|
||||
up disks for heavily crashing server). Defaults to
|
||||
$opt_max_save_core, set to 0 for no limit.
|
||||
|
||||
Options for coverage, profiling etc
|
||||
|
||||
|
|
|
|||
|
|
@ -278,3 +278,7 @@ double_val cast_val
|
|||
-1e+30 -9223372036854775808
|
||||
1e+30 9223372036854775807
|
||||
DROP TABLE t1;
|
||||
select isnull(date(NULL)), isnull(cast(NULL as DATE));
|
||||
isnull(date(NULL)) isnull(cast(NULL as DATE))
|
||||
1 1
|
||||
End of 4.1 tests
|
||||
|
|
|
|||
|
|
@ -504,8 +504,8 @@ select count(*) from t1 where x = 18446744073709551601;
|
|||
count(*)
|
||||
1
|
||||
create table t2 (x bigint not null);
|
||||
insert into t2(x) values (0xfffffffffffffff0);
|
||||
insert into t2(x) values (0xfffffffffffffff1);
|
||||
insert into t2(x) values (-16);
|
||||
insert into t2(x) values (-15);
|
||||
select * from t2;
|
||||
x
|
||||
-16
|
||||
|
|
|
|||
|
|
@ -2819,3 +2819,20 @@ select min(key1) from t1 where key1 >= 0.3762 and rand() + 0.5 >= 0.5;
|
|||
min(key1)
|
||||
0.37619999051094
|
||||
DROP TABLE t1,t2;
|
||||
create table t1(a bigint unsigned, b bigint);
|
||||
insert into t1 values (0xfffffffffffffffff, 0xfffffffffffffffff),
|
||||
(0x10000000000000000, 0x10000000000000000),
|
||||
(0x8fffffffffffffff, 0x8fffffffffffffff);
|
||||
Warnings:
|
||||
Warning 1264 Data truncated; out of range for column 'a' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'b' at row 1
|
||||
Warning 1264 Data truncated; out of range for column 'a' at row 2
|
||||
Warning 1264 Data truncated; out of range for column 'b' at row 2
|
||||
Warning 1264 Data truncated; out of range for column 'b' at row 3
|
||||
select hex(a), hex(b) from t1;
|
||||
hex(a) hex(b)
|
||||
FFFFFFFFFFFFFFFF 7FFFFFFFFFFFFFFF
|
||||
FFFFFFFFFFFFFFFF 7FFFFFFFFFFFFFFF
|
||||
8FFFFFFFFFFFFFFF 7FFFFFFFFFFFFFFF
|
||||
drop table t1;
|
||||
End of 4.1 tests
|
||||
|
|
|
|||
|
|
@ -278,4 +278,75 @@ select 1e-308, 1.00000001e-300, 100000000e-300;
|
|||
select 10e307;
|
||||
10e307
|
||||
1e+308
|
||||
create table t1(a int, b double(8, 2));
|
||||
insert into t1 values
|
||||
(1, 28.50), (1, 121.85), (1, 157.23), (1, 1351.00), (1, -1965.35), (1, 81.75),
|
||||
(1, 217.08), (1, 7.94), (4, 96.07), (4, 6404.65), (4, -6500.72), (2, 100.00),
|
||||
(5, 5.00), (5, -2104.80), (5, 2033.80), (5, 0.07), (5, 65.93),
|
||||
(3, -4986.24), (3, 5.00), (3, 4857.34), (3, 123.74), (3, 0.16),
|
||||
(6, -1695.31), (6, 1003.77), (6, 499.72), (6, 191.82);
|
||||
explain select sum(b) s from t1 group by a;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 ALL NULL NULL NULL NULL 26 Using temporary; Using filesort
|
||||
select sum(b) s from t1 group by a;
|
||||
s
|
||||
0.00
|
||||
100.00
|
||||
0.00
|
||||
-0.00
|
||||
-0.00
|
||||
0.00
|
||||
select sum(b) s from t1 group by a having s <> 0;
|
||||
s
|
||||
100.00
|
||||
select sum(b) s from t1 group by a having s <> 0 order by s;
|
||||
s
|
||||
100.00
|
||||
select sum(b) s from t1 group by a having s <=> 0;
|
||||
s
|
||||
0.00
|
||||
0.00
|
||||
-0.00
|
||||
-0.00
|
||||
0.00
|
||||
select sum(b) s from t1 group by a having s <=> 0 order by s;
|
||||
s
|
||||
-0.00
|
||||
-0.00
|
||||
0.00
|
||||
0.00
|
||||
0.00
|
||||
alter table t1 add key (a, b);
|
||||
explain select sum(b) s from t1 group by a;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 index NULL a 14 NULL 26 Using index
|
||||
select sum(b) s from t1 group by a;
|
||||
s
|
||||
0.00
|
||||
100.00
|
||||
0.00
|
||||
-0.00
|
||||
0.00
|
||||
0.00
|
||||
select sum(b) s from t1 group by a having s <> 0;
|
||||
s
|
||||
100.00
|
||||
select sum(b) s from t1 group by a having s <> 0 order by s;
|
||||
s
|
||||
100.00
|
||||
select sum(b) s from t1 group by a having s <=> 0;
|
||||
s
|
||||
0.00
|
||||
0.00
|
||||
-0.00
|
||||
0.00
|
||||
0.00
|
||||
select sum(b) s from t1 group by a having s <=> 0 order by s;
|
||||
s
|
||||
-0.00
|
||||
0.00
|
||||
0.00
|
||||
0.00
|
||||
0.00
|
||||
drop table t1;
|
||||
End of 4.1 tests
|
||||
|
|
|
|||
|
|
@ -167,4 +167,10 @@ INSERT INTO t1 SET f1 = +1.0e+30 ;
|
|||
SELECT f1 AS double_val, CAST(f1 AS SIGNED INT) AS cast_val FROM t1;
|
||||
DROP TABLE t1;
|
||||
|
||||
# End of 4.1 tests
|
||||
#
|
||||
# Bug #23938: cast(NULL as DATE)
|
||||
#
|
||||
|
||||
select isnull(date(NULL)), isnull(cast(NULL as DATE));
|
||||
|
||||
--echo End of 4.1 tests
|
||||
|
|
|
|||
|
|
@ -400,8 +400,8 @@ select count(*) from t1 where x = 18446744073709551601;
|
|||
|
||||
|
||||
create table t2 (x bigint not null);
|
||||
insert into t2(x) values (0xfffffffffffffff0);
|
||||
insert into t2(x) values (0xfffffffffffffff1);
|
||||
insert into t2(x) values (-16);
|
||||
insert into t2(x) values (-15);
|
||||
select * from t2;
|
||||
select count(*) from t2 where x>0;
|
||||
select count(*) from t2 where x=0;
|
||||
|
|
|
|||
|
|
@ -2342,4 +2342,15 @@ select min(key1) from t1 where key1 >= 0.3762 and rand() + 0.5 >= 0.5;
|
|||
DROP TABLE t1,t2;
|
||||
--enable_ps_protocol
|
||||
|
||||
# End of 4.1 tests
|
||||
#
|
||||
# Bug #22533: storing large hex strings
|
||||
#
|
||||
|
||||
create table t1(a bigint unsigned, b bigint);
|
||||
insert into t1 values (0xfffffffffffffffff, 0xfffffffffffffffff),
|
||||
(0x10000000000000000, 0x10000000000000000),
|
||||
(0x8fffffffffffffff, 0x8fffffffffffffff);
|
||||
select hex(a), hex(b) from t1;
|
||||
drop table t1;
|
||||
|
||||
--echo End of 4.1 tests
|
||||
|
|
|
|||
|
|
@ -188,4 +188,29 @@ select 1e-308, 1.00000001e-300, 100000000e-300;
|
|||
# check if overflows are detected correctly
|
||||
select 10e307;
|
||||
|
||||
#
|
||||
# Bug #19690: ORDER BY eliminates rows from the result
|
||||
#
|
||||
create table t1(a int, b double(8, 2));
|
||||
insert into t1 values
|
||||
(1, 28.50), (1, 121.85), (1, 157.23), (1, 1351.00), (1, -1965.35), (1, 81.75),
|
||||
(1, 217.08), (1, 7.94), (4, 96.07), (4, 6404.65), (4, -6500.72), (2, 100.00),
|
||||
(5, 5.00), (5, -2104.80), (5, 2033.80), (5, 0.07), (5, 65.93),
|
||||
(3, -4986.24), (3, 5.00), (3, 4857.34), (3, 123.74), (3, 0.16),
|
||||
(6, -1695.31), (6, 1003.77), (6, 499.72), (6, 191.82);
|
||||
explain select sum(b) s from t1 group by a;
|
||||
select sum(b) s from t1 group by a;
|
||||
select sum(b) s from t1 group by a having s <> 0;
|
||||
select sum(b) s from t1 group by a having s <> 0 order by s;
|
||||
select sum(b) s from t1 group by a having s <=> 0;
|
||||
select sum(b) s from t1 group by a having s <=> 0 order by s;
|
||||
alter table t1 add key (a, b);
|
||||
explain select sum(b) s from t1 group by a;
|
||||
select sum(b) s from t1 group by a;
|
||||
select sum(b) s from t1 group by a having s <> 0;
|
||||
select sum(b) s from t1 group by a having s <> 0 order by s;
|
||||
select sum(b) s from t1 group by a having s <=> 0;
|
||||
select sum(b) s from t1 group by a having s <=> 0 order by s;
|
||||
drop table t1;
|
||||
|
||||
--echo End of 4.1 tests
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue