VladPolskiy/MariaDB
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-21 23:50:01 +00:00
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
parent 237e24497b 63a5552e76
commit 4c6a59f120
3 changed files with 72 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
sql/sql_base.cc
View File

@ -7509,77 +7509,75 @@ 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.
*/
Item *item_1= nj_col_1->create_item(thd);
Item *item_2= nj_col_2->create_item(thd);
Item_ident *item_ident_1, *item_ident_2;
Item_func_eq *eq_cond;
if (!item_1 || !item_2)
goto err; // out of memory
/*
Create non-fixed fully qualified field and let fix_fields to
resolve it.
*/
Item *item_1= nj_col_1->create_item(thd);
Item *item_2= nj_col_2->create_item(thd);
Item_ident *item_ident_1, *item_ident_2;
Item_func_eq *eq_cond;
/*
The following assert checks that the two created items are of
type Item_ident.
*/
DBUG_ASSERT(!thd->lex->current_select->no_wrap_view_item);
/*
In the case of no_wrap_view_item == 0, the created items must be
of sub-classes of Item_ident.
*/
DBUG_ASSERT(item_1->type() == Item::FIELD_ITEM ||
item_1->type() == Item::REF_ITEM);
DBUG_ASSERT(item_2->type() == Item::FIELD_ITEM ||
item_2->type() == Item::REF_ITEM);
if (!item_1 || !item_2)
goto err; // out of memory
/*
We need to cast item_1,2 to Item_ident, because we need to hook name
resolution contexts specific to each item.
*/
item_ident_1= (Item_ident*) item_1;
item_ident_2= (Item_ident*) item_2;
/*
Create and hook special name resolution contexts to each item in the
new join condition . We need this to both speed-up subsequent name
resolution of these items, and to enable proper name resolution of
the items during the execute phase of PS.
*/
if (set_new_item_local_context(thd, item_ident_1, nj_col_1->table_ref) ||
set_new_item_local_context(thd, item_ident_2, nj_col_2->table_ref))
goto err;
/*
The following assert checks that the two created items are of
type Item_ident.
*/
DBUG_ASSERT(!thd->lex->current_select->no_wrap_view_item);
/*
In the case of no_wrap_view_item == 0, the created items must be
of sub-classes of Item_ident.
*/
DBUG_ASSERT(item_1->type() == Item::FIELD_ITEM ||
item_1->type() == Item::REF_ITEM);
DBUG_ASSERT(item_2->type() == Item::FIELD_ITEM ||
item_2->type() == Item::REF_ITEM);
if (!(eq_cond= new (thd->mem_root) Item_func_eq(thd, item_ident_1, item_ident_2)))
goto err; /* Out of memory. */
/*
We need to cast item_1,2 to Item_ident, because we need to hook name
resolution contexts specific to each item.
*/
item_ident_1= (Item_ident*) item_1;
item_ident_2= (Item_ident*) item_2;
/*
Create and hook special name resolution contexts to each item in the
new join condition . We need this to both speed-up subsequent name
resolution of these items, and to enable proper name resolution of
the items during the execute phase of PS.
*/
if (set_new_item_local_context(thd, item_ident_1, nj_col_1->table_ref) ||
set_new_item_local_context(thd, item_ident_2, nj_col_2->table_ref))
goto err;
/*
Add the new equi-join condition to the ON clause. Notice that
fix_fields() is applied to all ON conditions in setup_conds()
so we don't do it here.
*/
add_join_on(thd, (table_ref_1->outer_join & JOIN_TYPE_RIGHT ?
table_ref_1 : table_ref_2),
eq_cond);
if (!(eq_cond= new (thd->mem_root) Item_func_eq(thd, item_ident_1, item_ident_2)))
goto err; /* Out of memory. */
nj_col_1->is_common= nj_col_2->is_common= TRUE;
DBUG_PRINT ("info", ("%s.%s and %s.%s are common",
nj_col_1->safe_table_name().str,
nj_col_1->name().str,
nj_col_2->safe_table_name().str,
nj_col_2->name().str));
/*
Add the new equi-join condition to the ON clause. Notice that
fix_fields() is applied to all ON conditions in setup_conds()
so we don't do it here.
*/
add_join_on(thd, (table_ref_1->outer_join & JOIN_TYPE_RIGHT ?
table_ref_1 : table_ref_2),
eq_cond);
if (field_1)
update_field_dependencies(thd, field_1, field_1->table);
if (field_2)
update_field_dependencies(thd, field_2, field_2->table);
nj_col_1->is_common= nj_col_2->is_common= TRUE;
DBUG_PRINT ("info", ("%s.%s and %s.%s are common",
nj_col_1->safe_table_name().str,
nj_col_1->name().str,
nj_col_2->safe_table_name().str,
nj_col_2->name().str));
if (using_fields != NULL)
++(*found_using_fields);
}
if (field_1)
update_field_dependencies(thd, field_1, field_1->table);
if (field_2)
update_field_dependencies(thd, field_2, field_2->table);
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;