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

Merge 10.4 into 10.5

Browse Source 
The functional changes of commit 5836191c8f
(MDEV-21168) are omitted due to MDEV-742 having addressed the issue.
This commit is contained in:
Marko Mäkelä
2020-04-25 21:57:52 +03:00
parent 62903434eb a19782522b
commit fbe2712705
202 changed files with 2911 additions and 1669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_show.cc
View File

@ -64,6 +64,7 @@
#endif
#include "transaction.h"
#include "opt_trace.h"
#include "my_cpu.h"
enum enum_i_s_events_fields
{
@ -3630,6 +3631,11 @@ const char* get_one_variable(THD *thd,
end= pos + ls->length;
break;
}
case SHOW_ATOMIC_COUNTER_UINT32_T:
end= int10_to_str(
static_cast<long>(*static_cast<Atomic_counter<uint32_t>*>(value)),
buff, 10);
break;
case SHOW_UNDEF:
break; // Return empty string
case SHOW_SYS: // Cannot happen