Skip to content

Commit bbf73cb

Browse files
author
MySQL Build Team
committed
Updated/added copyright headers
2 parents 9c80f7d + 196b061 commit bbf73cb

File tree

94 files changed

+727
-2430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+727
-2430
lines changed

‎include/my_rnd.h‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#ifndef MY_RANDOM_INCLUDED
2+
#define MY_RANDOM_INCLUDED
3+
4+
/*
5+
Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
6+
7+
This program is free software; you can redistribute it and/or modify
8+
it under the terms of the GNU General Public License as published by
9+
the Free Software Foundation; version 2 of the License.
10+
11+
This program is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
GNU General Public License for more details.
15+
16+
You should have received a copy of the GNU General Public License
17+
along with this program; if not, write to the Free Software
18+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
19+
20+
/*
21+
A wrapper to use OpenSSL/YaSSL PRNGs.
22+
*/
23+
24+
#include <my_global.h>
25+
#include <mysql_com.h>
26+
#include <limits.h>
27+
28+
#ifdef __cplusplus
29+
extern "C" {
30+
#endif
31+
32+
double my_rnd_ssl(struct rand_struct *rand_st);
33+
34+
#ifdef __cplusplus
35+
}
36+
#endif
37+
38+
#endif /* MY_RANDOM_INCLUDED */

‎include/violite.h‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
1+
/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by
@@ -54,6 +54,7 @@ enum enum_vio_io_event
5454
#define VIO_LOCALHOST 1 /* a localhost connection */
5555
#define VIO_BUFFERED_READ 2 /* use buffered read */
5656
#define VIO_READ_BUFFER_SIZE 16384 /* size of read buffer */
57+
#define VIO_DESCRIPTION_SIZE 30 /* size of description */
5758

5859
Vio* vio_new(my_socket sd, enum enum_vio_type type, uint flags);
5960
Vio* mysql_socket_vio_new(MYSQL_SOCKET mysql_socket, enum enum_vio_type type, uint flags);
@@ -214,7 +215,11 @@ struct st_vio
214215
struct sockaddr_storage remote; /* Remote internet address */
215216
int addrLen; /* Length of remote address */
216217
enum enum_vio_type type; /* Type of connection */
217-
char desc[30]; /* String description */
218+
char desc[VIO_DESCRIPTION_SIZE]; /* Description string. This
219+
member MUST NOT be
220+
used directly, but only
221+
via function
222+
"vio_description" */
218223
char *read_buffer; /* buffer for vio_read_buff */
219224
char *read_pos; /* start of unfetched data in the
220225
read buffer */

‎libmysql/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License as published by
@@ -146,6 +146,7 @@ SET(CLIENT_SOURCES
146146
../sql/net_serv.cc
147147
../sql-common/pack.c
148148
../sql/password.c
149+
../sql/my_rnd.cc
149150
)
150151
ADD_CONVENIENCE_LIBRARY(clientlib ${CLIENT_SOURCES})
151152
DTRACE_INSTRUMENT(clientlib)

‎mysql-test/collections/default.experimental‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,7 @@ main.mysqlslap @windows # Bug#11761520 2010-08-10 alik mysqlsla
1010
main.signal_demo3 @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
1111
main.sp @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
1212

13-
main.subquery_sj_all_bka_nixbnl @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
14-
main.subquery_sj_all_bka @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
15-
main.subquery_sj_all_bkaunique @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
16-
main.subquery_sj_all @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
17-
main.subquery_sj_dupsweed_bka_nixbnl @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
18-
main.subquery_sj_dupsweed_bka @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
19-
main.subquery_sj_dupsweed_bkaunique @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
20-
main.subquery_sj_dupsweed @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
21-
main.subquery_sj_firstmatch_bka_nixbnl @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
22-
main.subquery_sj_firstmatch_bka @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
23-
main.subquery_sj_firstmatch_bkaunique @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
24-
main.subquery_sj_firstmatch @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
25-
main.subquery_sj_innodb_all_bka_nixbnl @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
26-
main.subquery_sj_innodb_all_bka @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
27-
main.subquery_sj_innodb_all_bkaunique @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
28-
main.subquery_sj_innodb_all @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
29-
main.subquery_sj_innodb_none_bka_nixbnl @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
30-
main.subquery_sj_innodb_none_bka @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
31-
main.subquery_sj_innodb_none_bkaunique @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
32-
main.subquery_sj_innodb_none @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
33-
main.subquery_sj_loosescan_bka_nixbnl @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
34-
main.subquery_sj_loosescan_bka @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
35-
main.subquery_sj_loosescan_bkaunique @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
36-
main.subquery_sj_loosescan @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
37-
main.subquery_sj_mat_bka_nixbnl @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
38-
main.subquery_sj_mat_bka @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
39-
main.subquery_sj_mat_bkaunique @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
40-
main.subquery_sj_mat_nosj @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
41-
main.subquery_sj_mat @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
42-
main.subquery_sj_none_bka_nixbnl @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
43-
main.subquery_sj_none_bka @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
44-
main.subquery_sj_none_bkaunique @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
45-
main.subquery_sj_none @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
13+
main.bug33509 @solaris # Bug#11753919 2012-02-16 didrik Several test cases fail on Solaris with error Thread stack overrun
4614

4715
main.kill @freebsd # Bug#12619719 2011-08-04 Occasional failure in PB2
4816

‎mysql-test/include/subquery_sj.inc‎

Lines changed: 0 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -2977,93 +2977,6 @@ select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
29772977
drop table t0, t1, t2, t3;
29782978

29792979

2980-
#
2981-
# BUG#33509: Server crashes with number of recursive subqueries=61
2982-
# (the query may or may not fail with an error so we're using it with SP
2983-
#
2984-
create table t1 (a int not null);
2985-
2986-
delimiter |;
2987-
2988-
--disable_warnings
2989-
drop procedure if exists p1|
2990-
--enable_warnings
2991-
CREATE PROCEDURE p1()
2992-
BEGIN
2993-
DECLARE EXIT HANDLER FOR SQLEXCEPTION select a from t1;
2994-
prepare s1 from '
2995-
select a from t1 where a in (
2996-
select a from t1 where a in (
2997-
select a from t1 where a in (
2998-
select a from t1 where a in (
2999-
select a from t1 where a in (
3000-
select a from t1 where a in (
3001-
select a from t1 where a in (
3002-
select a from t1 where a in (
3003-
select a from t1 where a in (
3004-
select a from t1 where a in (
3005-
select a from t1 where a in (
3006-
select a from t1 where a in (
3007-
select a from t1 where a in (
3008-
select a from t1 where a in (
3009-
select a from t1 where a in (
3010-
select a from t1 where a in (
3011-
select a from t1 where a in (
3012-
select a from t1 where a in (
3013-
select a from t1 where a in (
3014-
select a from t1 where a in (
3015-
select a from t1 where a in (
3016-
select a from t1 where a in (
3017-
select a from t1 where a in (
3018-
select a from t1 where a in (
3019-
select a from t1 where a in (
3020-
select a from t1 where a in (
3021-
select a from t1 where a in (
3022-
select a from t1 where a in (
3023-
select a from t1 where a in (
3024-
select a from t1 where a in (
3025-
select a from t1 where a in (
3026-
select a from t1 where a in (
3027-
select a from t1 where a in (
3028-
select a from t1 where a in (
3029-
select a from t1 where a in (
3030-
select a from t1 where a in (
3031-
select a from t1 where a in (
3032-
select a from t1 where a in (
3033-
select a from t1 where a in (
3034-
select a from t1 where a in (
3035-
select a from t1 where a in (
3036-
select a from t1 where a in (
3037-
select a from t1 where a in (
3038-
select a from t1 where a in (
3039-
select a from t1 where a in (
3040-
select a from t1 where a in (
3041-
select a from t1 where a in (
3042-
select a from t1 where a in (
3043-
select a from t1 where a in (
3044-
select a from t1 where a in (
3045-
select a from t1 where a in (
3046-
select a from t1 where a in (
3047-
select a from t1 where a in (
3048-
select a from t1 where a in (
3049-
select a from t1 where a in (
3050-
select a from t1 where a in (
3051-
select a from t1 where a in (
3052-
select a from t1 where a in (
3053-
select a from t1 where a in (
3054-
select a from t1 where a in (
3055-
select a from t1 where a in (
3056-
select a from t1 where a in ( select a from t1)
3057-
)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))';
3058-
execute s1;
3059-
END;
3060-
|
3061-
delimiter ;|
3062-
3063-
call p1();
3064-
drop procedure p1;
3065-
drop table t1;
3066-
30672980
#
30682981
# BUG#35468 "Slowdown and wrong result for uncorrelated subquery w/o where"
30692982
#

‎mysql-test/r/bug33509.result‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
create table t1 (a int not null);
2+
drop procedure if exists p1|
3+
CREATE PROCEDURE p1()
4+
BEGIN
5+
DECLARE EXIT HANDLER FOR SQLEXCEPTION select a from t1;
6+
prepare s1 from '
7+
select a from t1 where a in (
8+
select a from t1 where a in (
9+
select a from t1 where a in (
10+
select a from t1 where a in (
11+
select a from t1 where a in (
12+
select a from t1 where a in (
13+
select a from t1 where a in (
14+
select a from t1 where a in (
15+
select a from t1 where a in (
16+
select a from t1 where a in (
17+
select a from t1 where a in (
18+
select a from t1 where a in (
19+
select a from t1 where a in (
20+
select a from t1 where a in (
21+
select a from t1 where a in (
22+
select a from t1 where a in (
23+
select a from t1 where a in (
24+
select a from t1 where a in (
25+
select a from t1 where a in (
26+
select a from t1 where a in (
27+
select a from t1 where a in (
28+
select a from t1 where a in (
29+
select a from t1 where a in (
30+
select a from t1 where a in (
31+
select a from t1 where a in (
32+
select a from t1 where a in (
33+
select a from t1 where a in (
34+
select a from t1 where a in (
35+
select a from t1 where a in (
36+
select a from t1 where a in (
37+
select a from t1 where a in (
38+
select a from t1 where a in (
39+
select a from t1 where a in (
40+
select a from t1 where a in (
41+
select a from t1 where a in (
42+
select a from t1 where a in (
43+
select a from t1 where a in (
44+
select a from t1 where a in (
45+
select a from t1 where a in (
46+
select a from t1 where a in (
47+
select a from t1 where a in (
48+
select a from t1 where a in (
49+
select a from t1 where a in (
50+
select a from t1 where a in (
51+
select a from t1 where a in (
52+
select a from t1 where a in (
53+
select a from t1 where a in (
54+
select a from t1 where a in (
55+
select a from t1 where a in (
56+
select a from t1 where a in (
57+
select a from t1 where a in (
58+
select a from t1 where a in (
59+
select a from t1 where a in (
60+
select a from t1 where a in (
61+
select a from t1 where a in (
62+
select a from t1 where a in (
63+
select a from t1 where a in (
64+
select a from t1 where a in (
65+
select a from t1 where a in (
66+
select a from t1 where a in (
67+
select a from t1 where a in (
68+
select a from t1 where a in ( select a from t1)
69+
)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))';
70+
execute s1;
71+
END;
72+
|
73+
call p1();
74+
a
75+
drop procedure p1;
76+
drop table t1;

‎mysql-test/r/derived.result‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1949,3 +1949,16 @@ ORDER BY grandparent.col_varchar_nokey;
19491949
g1
19501950
r
19511951
DROP TABLE t1, t2, t3;
1952+
#
1953+
# Bug#13457552: Crash on instantiating a derived table in a query with
1954+
# empty result.
1955+
#
1956+
CREATE TABLE t1 ( pk INT, col_blob BLOB ) ENGINE = MyISAM;
1957+
CREATE TABLE t2 ( pk INT, col_blob BLOB ) ENGINE = InnoDB;
1958+
SELECT pk FROM ( SELECT col_blob, pk FROM t2 ) AS A NATURAL JOIN t1;
1959+
pk
1960+
EXPLAIN SELECT pk FROM ( SELECT col_blob, pk FROM t2 ) AS A NATURAL JOIN t1;
1961+
id select_type table type possible_keys key key_len ref rows Extra
1962+
1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables
1963+
2 DERIVED t2 ALL NULL NULL NULL NULL 1
1964+
DROP TABLE t1,t2;

‎mysql-test/r/subquery_sj_all.result‎

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -5549,82 +5549,6 @@ id select_type table type possible_keys key key_len ref rows Extra
55495549
1 PRIMARY t2 ALL NULL NULL NULL NULL 3 Using where; Using join buffer (Block Nested Loop)
55505550
2 DEPENDENT SUBQUERY t3 unique_subquery PRIMARY PRIMARY 4 func 1 Using index
55515551
drop table t0, t1, t2, t3;
5552-
create table t1 (a int not null);
5553-
drop procedure if exists p1|
5554-
CREATE PROCEDURE p1()
5555-
BEGIN
5556-
DECLARE EXIT HANDLER FOR SQLEXCEPTION select a from t1;
5557-
prepare s1 from '
5558-
select a from t1 where a in (
5559-
select a from t1 where a in (
5560-
select a from t1 where a in (
5561-
select a from t1 where a in (
5562-
select a from t1 where a in (
5563-
select a from t1 where a in (
5564-
select a from t1 where a in (
5565-
select a from t1 where a in (
5566-
select a from t1 where a in (
5567-
select a from t1 where a in (
5568-
select a from t1 where a in (
5569-
select a from t1 where a in (
5570-
select a from t1 where a in (
5571-
select a from t1 where a in (
5572-
select a from t1 where a in (
5573-
select a from t1 where a in (
5574-
select a from t1 where a in (
5575-
select a from t1 where a in (
5576-
select a from t1 where a in (
5577-
select a from t1 where a in (
5578-
select a from t1 where a in (
5579-
select a from t1 where a in (
5580-
select a from t1 where a in (
5581-
select a from t1 where a in (
5582-
select a from t1 where a in (
5583-
select a from t1 where a in (
5584-
select a from t1 where a in (
5585-
select a from t1 where a in (
5586-
select a from t1 where a in (
5587-
select a from t1 where a in (
5588-
select a from t1 where a in (
5589-
select a from t1 where a in (
5590-
select a from t1 where a in (
5591-
select a from t1 where a in (
5592-
select a from t1 where a in (
5593-
select a from t1 where a in (
5594-
select a from t1 where a in (
5595-
select a from t1 where a in (
5596-
select a from t1 where a in (
5597-
select a from t1 where a in (
5598-
select a from t1 where a in (
5599-
select a from t1 where a in (
5600-
select a from t1 where a in (
5601-
select a from t1 where a in (
5602-
select a from t1 where a in (
5603-
select a from t1 where a in (
5604-
select a from t1 where a in (
5605-
select a from t1 where a in (
5606-
select a from t1 where a in (
5607-
select a from t1 where a in (
5608-
select a from t1 where a in (
5609-
select a from t1 where a in (
5610-
select a from t1 where a in (
5611-
select a from t1 where a in (
5612-
select a from t1 where a in (
5613-
select a from t1 where a in (
5614-
select a from t1 where a in (
5615-
select a from t1 where a in (
5616-
select a from t1 where a in (
5617-
select a from t1 where a in (
5618-
select a from t1 where a in (
5619-
select a from t1 where a in ( select a from t1)
5620-
)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))';
5621-
execute s1;
5622-
END;
5623-
|
5624-
call p1();
5625-
a
5626-
drop procedure p1;
5627-
drop table t1;
56285552
create table t0 (a int);
56295553
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
56305554
create table t1 (a int) as select A.a + 10 *(B.a + 10*C.a) as a from t0 A, t0 B, t0 C;

0 commit comments

Comments
 (0)