database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge remote-tracking branch 'github/bb-11.4-release' into bb-11.8-serg

Browse Source
This commit is contained in:
Sergei Golubchik
2025-04-27 11:33:27 +02:00
committed by Oleksandr Byelkin
parent a0b77eb806 a8d4642375
commit 237e24497b
430 changed files with 14769 additions and 6751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_lex.h
View File

@@ -1552,6 +1552,10 @@ public:
bool is_unit_nest() { return (nest_flags & UNIT_NEST_FL); }
void mark_as_unit_nest() { nest_flags= UNIT_NEST_FL; }
bool is_sj_conversion_prohibited(THD *thd);
TABLE_LIST *find_table(THD *thd,
const LEX_CSTRING *db_name,
const LEX_CSTRING *table_name);
};
typedef class st_select_lex SELECT_LEX;
@@ -4642,7 +4646,7 @@ public:
int add_period(Lex_ident_column name,
Lex_ident_sys_st start, Lex_ident_sys_st end)
{
if (check_period_name(name.str)) {
if (check_column_name(name)) {
my_error(ER_WRONG_COLUMN_NAME, MYF(0), name.str);
return 1;
}