1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Temporary commit of 10.0-merge

This commit is contained in:
Michael Widenius
2013-03-26 00:03:13 +02:00
parent 35bc8f9f43
commit 068c61978e
649 changed files with 88289 additions and 22802 deletions

View File

@@ -32,9 +32,9 @@ struct PFS_thread;
struct row_threads
{
/** Column THREAD_ID. */
ulong m_thread_internal_id;
ulonglong m_thread_internal_id;
/** Column PROCESSLIST_ID. */
ulong m_thread_id;
ulonglong m_processlist_id;
/** Column NAME. */
const char* m_name;
/** Length in bytes of @c m_name. */
@@ -66,7 +66,7 @@ struct row_threads
/** Column INSTRUMENTED. */
bool *m_enabled_ptr;
/** Column PARENT_THREAD_ID. */
ulong m_parent_thread_internal_id;
ulonglong m_parent_thread_internal_id;
};
/** Table PERFORMANCE_SCHEMA.THREADS. */