← Back to branch summary

~ubuntu-branches/ubuntu/wily/mysql-5.6/wily

« back to all changes in this revision

Viewing changes to include/mysql/psi/psi_abi_v1.h.pp

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2015-04-16 20:07:10 UTC
  • mfrom: (1.2.5)
  • mto: This revision was merged to the branch mainline in revision 11.
  • Revision ID: package-import@ubuntu.com-20150416200710-pfv24hkypwgmv7h6
https://launchpad.net/bugs/1444616
* SECURITY UPDATE: Update to 5.5.41 to fix security issues (LP: #1444616)
  - http://www.oracle.com/technetwork/topics/security/cpuapr2015-2365600.html
  - CVE-2015-0498
  - CVE-2015-0499
  - CVE-2015-0500
  - CVE-2015-0501
  - CVE-2015-0503
  - CVE-2015-0505
  - CVE-2015-0506
  - CVE-2015-0507
  - CVE-2015-0508
  - CVE-2015-0511
  - CVE-2015-2567
  - CVE-2015-2571
* debian/rules: fix ftbfs by building the sql directory first so the
  required files are generated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/mysql/psi/psi_abi_v1.h.pp
1
1
#include "mysql/psi/psi.h"
2
2
C_MODE_START
3
3
struct TABLE_SHARE;
4
 
struct OPAQUE_LEX_YYSTYPE;
 
4
struct sql_digest_storage;
5
5
struct PSI_mutex;
6
6
typedef struct PSI_mutex PSI_mutex;
7
7
struct PSI_rwlock;
241
241
  void *m_wait;
242
242
  uint m_index;
243
243
};
244
 
struct PSI_digest_storage
245
 
{
246
 
  my_bool m_full;
247
 
  int m_byte_count;
248
 
  uint m_charset_number;
249
 
  unsigned char m_token_array[1024];
250
 
};
251
 
typedef struct PSI_digest_storage PSI_digest_storage;
252
 
struct PSI_digest_locker_state
253
 
{
254
 
  int m_last_id_index;
255
 
  PSI_digest_storage m_digest_storage;
256
 
};
257
 
typedef struct PSI_digest_locker_state PSI_digest_locker_state;
258
244
struct PSI_statement_locker_state_v1
259
245
{
260
246
  my_bool m_discarded;
280
266
  ulong m_sort_range;
281
267
  ulong m_sort_rows;
282
268
  ulong m_sort_scan;
283
 
  PSI_digest_locker_state m_digest_state;
 
269
  const struct sql_digest_storage *m_digest;
284
270
  char m_schema_name[(64 * 3)];
285
271
  uint m_schema_name_length;
286
272
};
508
494
typedef void (*set_socket_thread_owner_v1_t)(struct PSI_socket *socket);
509
495
typedef struct PSI_digest_locker * (*digest_start_v1_t)
510
496
  (struct PSI_statement_locker *locker);
511
 
typedef struct PSI_digest_locker* (*digest_add_token_v1_t)
512
 
  (struct PSI_digest_locker *locker, uint token, struct OPAQUE_LEX_YYSTYPE *yylval);
 
497
typedef void (*digest_end_v1_t)
 
498
  (struct PSI_digest_locker *locker, const struct sql_digest_storage *digest);
513
499
typedef int (*set_thread_connect_attrs_v1_t)(const char *buffer, uint length,
514
500
                                             const void *from_cs);
515
501
struct PSI_v1
610
596
  set_socket_info_v1_t set_socket_info;
611
597
  set_socket_thread_owner_v1_t set_socket_thread_owner;
612
598
  digest_start_v1_t digest_start;
613
 
  digest_add_token_v1_t digest_add_token;
 
599
  digest_end_v1_t digest_end;
614
600
  set_thread_connect_attrs_v1_t set_thread_connect_attrs;
615
601
};
616
602
typedef struct PSI_v1 PSI;