database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch 'bb-10.2-serg-merge' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2017-02-11 09:45:34 +01:00
parent 5593458062 2195bb4e41
commit f3914d10b6
219 changed files with 11142 additions and 2970 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sql/sql_class.h
View File

@ -3998,27 +3998,7 @@ public:
}
}
private:
/*
This reference points to the table arena when the expression
for a virtual column is being evaluated
*/
Query_arena *arena_for_cached_items;
public:
void reset_arena_for_cached_items(Query_arena *new_arena)
{
arena_for_cached_items= new_arena;
}
Query_arena *switch_to_arena_for_cached_items(Query_arena *backup)
{
if (!arena_for_cached_items)
return 0;
set_n_backup_active_arena(arena_for_cached_items, backup);
return backup;
}
void clear_wakeup_ready() { wakeup_ready= false; }
/*
Sleep waiting for others to wake us up with signal_wakeup_ready().