mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.11 -> 11.4

Browse source 
Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
This commit is contained in:
Kristian Nielsen 2024-12-05 11:01:42 +01:00
commit 0f47db8525
78 changed files with 1334 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sql/set_var.h
View file

@ -26,6 +26,7 @@
#endif
#include <my_getopt.h>
#include <my_attribute.h>
class sys_var;
class set_var;
@ -249,9 +250,11 @@ protected:
Typically it's the same as session_value_ptr(), but it's different,
for example, for ENUM, that is printed as a string, but stored as a number.
*/
ATTRIBUTE_NO_UBSAN
uchar *session_var_ptr(THD *thd) const
{ return ((uchar*)&(thd->variables)) + offset; }
ATTRIBUTE_NO_UBSAN
uchar *global_var_ptr() const
{ return ((uchar*)&global_system_variables) + offset; }