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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2022-08-30 12:29:04 +03:00
parent 0324bde846 7e574eb52c
commit 29fa9bcee0
16 changed files with 341 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_lex.h
View File

@ -35,6 +35,7 @@
#include "item.h"
#include "sql_limit.h" // Select_limit_counters
#include "sql_schema.h"
#include "table.h"
/* Used for flags of nesting constructs */
#define SELECT_NESTING_MAP_SIZE 64
@ -4545,6 +4546,11 @@ public:
int add_period(Lex_ident name, Lex_ident_sys_st start, Lex_ident_sys_st end)
{
if (check_period_name(name.str)) {
my_error(ER_WRONG_COLUMN_NAME, MYF(0), name.str);
return 1;
}
if (lex_string_cmp(system_charset_info, &start, &end) == 0)
{
my_error(ER_FIELD_SPECIFIED_TWICE, MYF(0), start.str);