diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-05-07 16:12:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-05-07 16:12:16 +0200 |
| commit | 5ffe939a6c00f072d885fc324354ccf3ebaa2657 (patch) | |
| tree | 4c19c0e2ddf54e10029b6e03a745bc863a37daa0 /include/mysql | |
| parent | a30477b32293d2914fe9147630266d8238d8ec2e (diff) | |
| parent | 04bce7b569f44f3aca3cb21953d41c2a4a02efe6 (diff) | |
| download | mariadb-git-5ffe939a6c00f072d885fc324354ccf3ebaa2657.tar.gz | |
perfschema 5.6.17
Diffstat (limited to 'include/mysql')
| -rw-r--r-- | include/mysql/psi/mysql_file.h | 2 | ||||
| -rw-r--r-- | include/mysql/psi/mysql_idle.h | 2 | ||||
| -rw-r--r-- | include/mysql/psi/mysql_stage.h | 2 | ||||
| -rw-r--r-- | include/mysql/psi/psi.h | 4 | ||||
| -rw-r--r-- | include/mysql/psi/psi_abi_v1.h.pp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/include/mysql/psi/mysql_file.h b/include/mysql/psi/mysql_file.h index c226258f462..c839b2b019b 100644 --- a/include/mysql/psi/mysql_file.h +++ b/include/mysql/psi/mysql_file.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/include/mysql/psi/mysql_idle.h b/include/mysql/psi/mysql_idle.h index c53d0ceb8c7..5c72b715b7a 100644 --- a/include/mysql/psi/mysql_idle.h +++ b/include/mysql/psi/mysql_idle.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/include/mysql/psi/mysql_stage.h b/include/mysql/psi/mysql_stage.h index 61bfdbb7d59..91a5c12f82e 100644 --- a/include/mysql/psi/mysql_stage.h +++ b/include/mysql/psi/mysql_stage.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/include/mysql/psi/psi.h b/include/mysql/psi/psi.h index cc2057c630d..30f2709be0f 100644 --- a/include/mysql/psi/psi.h +++ b/include/mysql/psi/psi.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1372,7 +1372,7 @@ typedef void (*set_thread_state_v1_t)(const char* state); @param info the process into string @param info_len the process into string length */ -typedef void (*set_thread_info_v1_t)(const char* info, int info_len); +typedef void (*set_thread_info_v1_t)(const char* info, uint info_len); /** Attach a thread instrumentation to the running thread. diff --git a/include/mysql/psi/psi_abi_v1.h.pp b/include/mysql/psi/psi_abi_v1.h.pp index f2037c5b724..fa2bf724b5e 100644 --- a/include/mysql/psi/psi_abi_v1.h.pp +++ b/include/mysql/psi/psi_abi_v1.h.pp @@ -357,7 +357,7 @@ typedef void (*set_thread_db_v1_t)(const char* db, int db_len); typedef void (*set_thread_command_v1_t)(int command); typedef void (*set_thread_start_time_v1_t)(time_t start_time); typedef void (*set_thread_state_v1_t)(const char* state); -typedef void (*set_thread_info_v1_t)(const char* info, int info_len); +typedef void (*set_thread_info_v1_t)(const char* info, uint info_len); typedef void (*set_thread_v1_t)(struct PSI_thread *thread); typedef void (*delete_current_thread_v1_t)(void); typedef void (*delete_thread_v1_t)(struct PSI_thread *thread); |