Skip to content

Commit 8d36caf

Browse files
sanja-byelkinsanja-byelkin
committed
Merge branch '11.4' into 11.8
2 parents d1a2dc5 + 118cfcf commit 8d36caf

26 files changed

+103
-92
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ IF(WIN32)
373373
ELSE()
374374
SET(DEFAULT_MYSQL_HOME ${CMAKE_INSTALL_PREFIX})
375375
SET(SHAREDIR ${INSTALL_MYSQLSHAREDIRABS})
376+
SET(HOSTNAME "uname -n" CACHE STRING "Command for determining hostname")
376377
ENDIF()
377378

378379
SET(DEFAULT_BASEDIR "${DEFAULT_MYSQL_HOME}")

‎include/my_sys.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,9 @@ extern my_bool my_use_large_pages;
180180

181181
int my_init_large_pages(void);
182182
uchar *my_large_malloc(size_t *size, myf my_flags);
183-
#if defined _WIN32 || defined HAVE_MMAP
183+
#ifdef _WIN32
184+
/* On Windows, use my_virtual_mem_reserve() and my_virtual_mem_commit(). */
185+
#else
184186
char *my_large_virtual_alloc(size_t *size);
185187
#endif
186188
void my_large_free(void *ptr, size_t size);

‎include/my_virtual_mem.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
extern "C" {
2525
#endif
2626

27+
# ifdef _WIN32
2728
char *my_virtual_mem_reserve(size_t *size);
29+
# endif
2830
char *my_virtual_mem_commit(char *ptr, size_t size);
2931
void my_virtual_mem_decommit(char *ptr, size_t size);
3032
void my_virtual_mem_release(char *ptr, size_t size);

‎mysql-test/main/opt_trace.result

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,6 +1285,7 @@ explain select * from t1,t2 where t1.a=t2.b+2 and t2.a= t1.b {
12851285
],
12861286
"chosen_access_method": {
12871287
"type": "ref",
1288+
"index": "a",
12881289
"rows_read": 1,
12891290
"rows_out": 1,
12901291
"cost": 0.1821659,
@@ -1340,6 +1341,7 @@ explain select * from t1,t2 where t1.a=t2.b+2 and t2.a= t1.b {
13401341
],
13411342
"chosen_access_method": {
13421343
"type": "ref",
1344+
"index": "a",
13431345
"rows_read": 1,
13441346
"rows_out": 1,
13451347
"cost": 0.1821659,
@@ -2533,6 +2535,7 @@ explain select * from t1 where a=1 and b=2 order by c limit 1 {
25332535
],
25342536
"chosen_access_method": {
25352537
"type": "ref",
2538+
"index": "a_b",
25362539
"rows_read": 41,
25372540
"rows_out": 41,
25382541
"cost": 0.051379171,
@@ -3012,6 +3015,7 @@ explain select * from t1 left join t2 on t2.a=t1.a {
30123015
],
30133016
"chosen_access_method": {
30143017
"type": "eq_ref",
3018+
"index": "PRIMARY",
30153019
"rows_read": 1,
30163020
"rows_out": 1,
30173021
"cost": 0.007120904,
@@ -3980,6 +3984,7 @@ explain select * from t1 where pk = 2 and a=5 and b=1 {
39803984
],
39813985
"chosen_access_method": {
39823986
"type": "ref",
3987+
"index": "pk_a_b",
39833988
"rows_read": 1,
39843989
"rows_out": 1,
39853990
"cost": 0.000928812,
@@ -4676,6 +4681,7 @@ explain delete t0,t1 from t0, t1 where t0.a=t1.a and t1.a<3 {
46764681
],
46774682
"chosen_access_method": {
46784683
"type": "range",
4684+
"index": "a",
46794685
"rows_read": 3,
46804686
"rows_out": 3,
46814687
"cost": 0.001755494,
@@ -4702,6 +4708,7 @@ explain delete t0,t1 from t0, t1 where t0.a=t1.a and t1.a<3 {
47024708
],
47034709
"chosen_access_method": {
47044710
"type": "range",
4711+
"index": "a",
47054712
"rows_read": 3,
47064713
"rows_out": 3,
47074714
"cost": 0.001755494,
@@ -4744,6 +4751,7 @@ explain delete t0,t1 from t0, t1 where t0.a=t1.a and t1.a<3 {
47444751
],
47454752
"chosen_access_method": {
47464753
"type": "ref",
4754+
"index": "a",
47474755
"rows_read": 1,
47484756
"rows_out": 1,
47494757
"cost": 0.002376836,
@@ -4795,6 +4803,7 @@ explain delete t0,t1 from t0, t1 where t0.a=t1.a and t1.a<3 {
47954803
],
47964804
"chosen_access_method": {
47974805
"type": "ref",
4806+
"index": "a",
47984807
"rows_read": 1.166666667,
47994808
"rows_out": 1.166666667,
48004809
"cost": 0.002392836,
@@ -11275,6 +11284,7 @@ JS
1127511284
"chosen_access_method":
1127611285
{
1127711286
"type": "ref",
11287+
"index": "b",
1127811288
"rows_read": 1,
1127911289
"rows_out": 1,
1128011290
"cost": 0.01901531,
@@ -11521,6 +11531,7 @@ JS
1152111531
"chosen_access_method":
1152211532
{
1152311533
"type": "ref",
11534+
"index": "a",
1152411535
"rows_read": 1,
1152511536
"rows_out": 1,
1152611537
"cost": 0.01840091,
@@ -12906,6 +12917,7 @@ json_detailed(json_extract(trace, '$**.choose_best_splitting'))
1290612917
"chosen_access_method":
1290712918
{
1290812919
"type": "ref",
12920+
"index": "idx_a",
1290912921
"rows_read": 1.8367,
1291012922
"rows_out": 1.8367,
1291112923
"cost": 0.002051185,
@@ -13201,6 +13213,7 @@ explain select * from t1 where a<10 and b between 10 and 50 and c < 10 {
1320113213
],
1320213214
"chosen_access_method": {
1320313215
"type": "range",
13216+
"index": "a",
1320413217
"rows_read": 0.189,
1320513218
"rows_out": 0.017766,
1320613219
"cost": 0.006364199,

‎mysql-test/main/opt_trace_index_merge_innodb.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ explain select * from t1 where pk1 != 0 and key1 = 1 {
227227
],
228228
"chosen_access_method": {
229229
"type": "ref",
230+
"index": "key1",
230231
"rows_read": 1,
231232
"rows_out": 1,
232233
"cost": 0.00345856,

‎mysql-test/main/opt_trace_selectivity.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ JS
186186
"chosen_access_method":
187187
{
188188
"type": "ref",
189+
"index": "a",
189190
"rows_read": 6,
190191
"rows_out": 0.6,
191192
"cost": 0.005388489,

‎mysql-test/main/selectivity_innodb_notembedded.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ JS
298298
"chosen_access_method":
299299
{
300300
"type": "range",
301+
"index": "PRIMARY",
301302
"rows_read": 5,
302303
"rows_out": 2.490196078,
303304
"cost": 0.00948507,

‎mysql-test/main/selectivity_notembedded.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ JS
293293
"chosen_access_method":
294294
{
295295
"type": "range",
296+
"index": "PRIMARY",
296297
"rows_read": 5,
297298
"rows_out": 2.490196078,
298299
"cost": 0.010014472,

‎mysql-test/suite/innodb/r/innodb_buffer_pool_resize.result

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,19 @@ select @@innodb_buffer_pool_size;
1212
10485760
1313
create table t1 (id int primary key, val int not null)
1414
ENGINE=InnoDB ROW_FORMAT=COMPRESSED;
15+
create table t2 (id int primary key, val int not null)
16+
ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=$kbs;
1517
SET STATEMENT foreign_key_checks=0, unique_checks=0 FOR
1618
INSERT INTO t1 SELECT seq*4,seq*4 FROM seq_1_to_262144;
19+
SET STATEMENT foreign_key_checks=0, unique_checks=0 FOR
20+
INSERT INTO t2 SELECT seq*4,seq*4 FROM seq_1_to_16384;
1721
set global innodb_buffer_pool_size = 7340032;
1822
select count(val) from t1;
1923
count(val)
2024
262144
25+
select count(val) from t2;
26+
count(val)
27+
16384
2128
set global innodb_adaptive_hash_index=OFF;
2229
set global innodb_buffer_pool_size = 24117248;
2330
set global innodb_buffer_pool_size = 26214400;
@@ -29,7 +36,10 @@ select @@innodb_buffer_pool_size;
2936
select count(val) from t1;
3037
count(val)
3138
262144
32-
drop table t1;
39+
select count(val) from t2;
40+
count(val)
41+
16384
42+
drop table t1,t2;
3343
SET GLOBAL innodb_max_purge_lag_wait = 0;
3444
SET @save_pct= @@GLOBAL.innodb_max_dirty_pages_pct;
3545
SET @save_pct_lwm= @@GLOBAL.innodb_max_dirty_pages_pct_lwm;

‎mysql-test/suite/innodb/t/innodb_buffer_pool_resize.test

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ set global innodb_buffer_pool_size = 9437184;
2121
set global innodb_buffer_pool_size = 10485760;
2222

2323
select @@innodb_buffer_pool_size;
24+
let $kbs=`SELECT CAST(@@innodb_page_size / 1024 AS INT)`;
2425

2526
# fill buffer pool
2627
--disable_query_log
@@ -29,9 +30,13 @@ SET GLOBAL innodb_read_only_compressed=OFF;
2930
--enable_query_log
3031
create table t1 (id int primary key, val int not null)
3132
ENGINE=InnoDB ROW_FORMAT=COMPRESSED;
33+
evalp create table t2 (id int primary key, val int not null)
34+
ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=$kbs;
3235

3336
SET STATEMENT foreign_key_checks=0, unique_checks=0 FOR
3437
INSERT INTO t1 SELECT seq*4,seq*4 FROM seq_1_to_262144;
38+
SET STATEMENT foreign_key_checks=0, unique_checks=0 FOR
39+
INSERT INTO t2 SELECT seq*4,seq*4 FROM seq_1_to_16384;
3540

3641
--disable_query_log
3742
SET GLOBAL innodb_read_only_compressed=@save_innodb_read_only_compressed;
@@ -42,6 +47,7 @@ SET GLOBAL innodb_read_only_compressed=@save_innodb_read_only_compressed;
4247
set global innodb_buffer_pool_size = 7340032;
4348

4449
select count(val) from t1;
50+
select count(val) from t2;
4551

4652
set global innodb_adaptive_hash_index=OFF;
4753

@@ -52,8 +58,9 @@ set global innodb_buffer_pool_size = 26214400;
5258
select @@innodb_buffer_pool_size;
5359

5460
select count(val) from t1;
61+
select count(val) from t2;
5562

56-
drop table t1;
63+
drop table t1,t2;
5764

5865
SET GLOBAL innodb_max_purge_lag_wait = 0;
5966
SET @save_pct= @@GLOBAL.innodb_max_dirty_pages_pct;
@@ -66,8 +73,6 @@ SELECT variable_value = 0
6673
FROM information_schema.global_status
6774
WHERE variable_name = 'INNODB_BUFFER_POOL_PAGES_DIRTY';
6875
--source include/wait_condition.inc
69-
# this may occasionally be aborted on a heavily loaded builder
70-
--error 0,ER_WRONG_USAGE
7176
SET GLOBAL innodb_buffer_pool_size = @old_innodb_buffer_pool_size;
7277
SET GLOBAL innodb_adaptive_hash_index = @old_innodb_adaptive_hash_index;
7378
SET GLOBAL innodb_max_dirty_pages_pct = @save_pct;

0 commit comments

Comments
 (0)