1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '11.4' into 11.8

Browse Source
This commit is contained in:
Oleksandr Byelkin 2025-04-28 19:10:10 +02:00
commit 4c6a59f120
3 changed files with 72 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_base.cc
View File

@ -7509,8 +7509,7 @@ mark_common_columns(THD *thd, TABLE_LIST *table_ref_1, TABLE_LIST *table_ref_2,
clause (if present), mark them as common fields, and add a new
equi-join condition to the ON clause.
*/
if (nj_col_2)
{
/*
Create non-fixed fully qualified field and let fix_fields to
resolve it.
@ -7580,7 +7579,6 @@ mark_common_columns(THD *thd, TABLE_LIST *table_ref_1, TABLE_LIST *table_ref_2,
if (using_fields != NULL)
++(*found_using_fields);
}
}
if (leaf_1)
leaf_1->is_join_columns_complete= TRUE;

2
storage/rocksdb/ha_rocksdb.cc
View File

@ -1238,7 +1238,7 @@ static MYSQL_SYSVAR_UINT(
"Statistics Level for RocksDB. Default is 0 (kExceptHistogramOrTimers)",
nullptr, rocksdb_set_rocksdb_stats_level,
/* default */ (uint)rocksdb::StatsLevel::kExceptHistogramOrTimers,
/* min */ (uint)rocksdb::StatsLevel::kExceptHistogramOrTimers,
/* min */ (uint)rocksdb::StatsLevel::kDisableAll,
/* max */ (uint)rocksdb::StatsLevel::kAll, 0);
static MYSQL_SYSVAR_SIZE_T(compaction_readahead_size,

20
storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_stats_level_basic.result
View File

@ -11,7 +11,7 @@ INSERT INTO invalid_values VALUES('\'484436\'');
SET @start_global_value = @@global.ROCKSDB_STATS_LEVEL;
SELECT @start_global_value;
@start_global_value
0
1
'# Setting to valid values in global scope#'
"Trying to set variable @@global.ROCKSDB_STATS_LEVEL to 0"
SET @@global.ROCKSDB_STATS_LEVEL = 0;
@ -22,7 +22,7 @@ SELECT @@global.ROCKSDB_STATS_LEVEL;
SET @@global.ROCKSDB_STATS_LEVEL = DEFAULT;
SELECT @@global.ROCKSDB_STATS_LEVEL;
@@global.ROCKSDB_STATS_LEVEL
0
1
"Trying to set variable @@global.ROCKSDB_STATS_LEVEL to 4"
SET @@global.ROCKSDB_STATS_LEVEL = 4;
SELECT @@global.ROCKSDB_STATS_LEVEL;
@ -32,7 +32,7 @@ SELECT @@global.ROCKSDB_STATS_LEVEL;
SET @@global.ROCKSDB_STATS_LEVEL = DEFAULT;
SELECT @@global.ROCKSDB_STATS_LEVEL;
@@global.ROCKSDB_STATS_LEVEL
0
1
"Trying to set variable @@global.ROCKSDB_STATS_LEVEL to 2"
SET @@global.ROCKSDB_STATS_LEVEL = 2;
SELECT @@global.ROCKSDB_STATS_LEVEL;
@ -42,7 +42,7 @@ SELECT @@global.ROCKSDB_STATS_LEVEL;
SET @@global.ROCKSDB_STATS_LEVEL = DEFAULT;
SELECT @@global.ROCKSDB_STATS_LEVEL;
@@global.ROCKSDB_STATS_LEVEL
0
1
"Trying to set variable @@session.ROCKSDB_STATS_LEVEL to 444. It should fail because it is not session."
SET @@session.ROCKSDB_STATS_LEVEL = 444;
ERROR HY000: Variable 'rocksdb_stats_level' is a GLOBAL variable and should be set with SET GLOBAL
@ -52,34 +52,34 @@ SET @@global.ROCKSDB_STATS_LEVEL = 'aaa';
Got one of the listed errors
SELECT @@global.ROCKSDB_STATS_LEVEL;
@@global.ROCKSDB_STATS_LEVEL
0
1
"Trying to set variable @@global.ROCKSDB_STATS_LEVEL to 'bbb'"
SET @@global.ROCKSDB_STATS_LEVEL = 'bbb';
Got one of the listed errors
SELECT @@global.ROCKSDB_STATS_LEVEL;
@@global.ROCKSDB_STATS_LEVEL
0
1
"Trying to set variable @@global.ROCKSDB_STATS_LEVEL to '-1'"
SET @@global.ROCKSDB_STATS_LEVEL = '-1';
Got one of the listed errors
SELECT @@global.ROCKSDB_STATS_LEVEL;
@@global.ROCKSDB_STATS_LEVEL
0
1
"Trying to set variable @@global.ROCKSDB_STATS_LEVEL to '101'"
SET @@global.ROCKSDB_STATS_LEVEL = '101';
Got one of the listed errors
SELECT @@global.ROCKSDB_STATS_LEVEL;
@@global.ROCKSDB_STATS_LEVEL
0
1
"Trying to set variable @@global.ROCKSDB_STATS_LEVEL to '484436'"
SET @@global.ROCKSDB_STATS_LEVEL = '484436';
Got one of the listed errors
SELECT @@global.ROCKSDB_STATS_LEVEL;
@@global.ROCKSDB_STATS_LEVEL
0
1
SET @@global.ROCKSDB_STATS_LEVEL = @start_global_value;
SELECT @@global.ROCKSDB_STATS_LEVEL;
@@global.ROCKSDB_STATS_LEVEL
0
1
DROP TABLE valid_values;
DROP TABLE invalid_values;