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 branch '10.5' into 10.6

Browse Source
This commit is contained in:
Sergei Golubchik
2022-10-02 22:14:21 +02:00
parent 2ab52cc0e5 3a2116241b
commit 900d7bf360
245 changed files with 9723 additions and 2458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_class.h
View File

@ -120,8 +120,8 @@ enum enum_slave_type_conversions { SLAVE_TYPE_CONVERSIONS_ALL_LOSSY,
SLAVE_TYPE_CONVERSIONS_ALL_NON_LOSSY};
/*
MARK_COLUMNS_READ: A column is goind to be read.
MARK_COLUMNS_WRITE: A column is going to be written to.
COLUMNS_READ: A column is goind to be read.
COLUMNS_WRITE: A column is going to be written to.
MARK_COLUMNS_READ: A column is goind to be read.
A bit in read set is set to inform handler that the field
is to be read. If field list contains duplicates, then
@ -1334,6 +1334,7 @@ public:
LEX_CSTRING name; /* name for named prepared statements */
LEX *lex; // parse tree descriptor
my_hrtime_t hr_prepare_time; // time of preparation in microseconds
/*
Points to the query associated with this statement. It's const, but
we need to declare it char * because all table handlers are written