3389 Mayank Prasad 2011-10-13
correction for compilation error for gcov
modified:
sql/sql_lex.cc
storage/perfschema/pfs_digest.cc
storage/perfschema/pfs_digest.h
storage/perfschema/pfs_events_statements.h
3388 Marc Alff 2011-10-13
Fixed windows build break (tentative)
my_sys.h is needed early for my_pthread.h on windows.
modified:
storage/perfschema/pfs_digest.cc
=== modified file 'sql/sql_lex.cc'
--- a/sql/sql_lex.cc 2011-10-11 07:35:41 +0000
+++ b/sql/sql_lex.cc 2011-10-13 10:49:15 +0000
@@ -32,23 +32,30 @@
/*
Passing token to PS function to calculate statement digest
for this statement.
- */ \
- if( _token != 0 ) \
- { \
- uint yylen= 0; \
- char *yychar= NULL; \
- if( _token != END_OF_INPUT ) \
- { \
- /*
- get the length of processed token and make sure it doesn't exceed
- TOCK_NAME_LENGTH. If it does, truncate it to TOCK_NAME_LENGTH.
- */ \
- yylen= _yylen!=0 ? _yylen : lip->yyLength_PS(); \
- yylen= yylen<TOCK_NAME_LENGTH ? yylen : TOCK_NAME_LENGTH-1; \
- yychar= _yychar ? (char*)_yychar : \
- (char*)lip->get_cpp_tok_start(); \
- } \
- PSI_CALL(digest_add_token)(lip->m_digest_psi,_token,yychar,yylen); \
+ */ \
+ if( _token != 0 ) \
+ { \
+ uint yylen= 0; \
+ char *yychar= NULL; \
+ if( _token != END_OF_INPUT ) \
+ { \
+ if( _yylen!=0 ) \
+ { \
+ yylen= _yylen; \
+ yychar= (char*)_yychar; \
+ } \
+ else \
+ { \
+ /*
+ Get the length of processed token and make sure it doesn't exceed \
+ TOCK_NAME_LENGTH. If it does, truncate it to TOCK_NAME_LENGTH. \
+ */ \
+ yylen= lip->yyLength_PS(); \
+ yylen= yylen<TOCK_NAME_LENGTH ? yylen : TOCK_NAME_LENGTH-1; \
+ yychar= (char*)lip->get_cpp_tok_start(); \
+ } \
+ } \
+ PSI_CALL(digest_add_token)(lip->m_digest_psi,_token,yychar,yylen); \
}
static int lex_one_token(void *arg, void *yythd);
=== modified file 'storage/perfschema/pfs_digest.cc'
--- a/storage/perfschema/pfs_digest.cc 2011-10-13 08:04:17 +0000
+++ b/storage/perfschema/pfs_digest.cc 2011-10-13 10:49:15 +0000
@@ -20,6 +20,7 @@
#include "my_global.h"
#include "my_sys.h"
+#include "pfs_instr.h"
#include "pfs_digest.h"
#include "pfs_global.h"
#include <string.h>
=== modified file 'storage/perfschema/pfs_digest.h'
--- a/storage/perfschema/pfs_digest.h 2011-10-04 12:16:34 +0000
+++ b/storage/perfschema/pfs_digest.h 2011-10-13 10:49:15 +0000
@@ -22,11 +22,28 @@
*/
#include "pfs_column_types.h"
-#include "my_global.h"
#include "lf.h"
-#include "pfs_instr.h"
extern bool flag_statements_digest;
+struct PFS_thread;
+
+/**
+ Structure to store a MD5 hash value (digest) for a statement.
+*/
+struct {
+ unsigned char m_md5[16];
+ }typedef PFS_digest_hash;
+
+/**
+ Structure to store token count/array for a statement
+ on which digest is to be calculated.
+*/
+#define PFS_MAX_TOKEN_COUNT 1024
+struct {
+ uint m_token_count;
+ uint m_token_array[PFS_MAX_TOKEN_COUNT];
+ PFS_digest_hash m_digest_hash;
+ } typedef PFS_digest_storage;
/** A statement digest stat record. */
struct PFS_statements_digest_stat
=== modified file 'storage/perfschema/pfs_events_statements.h'
--- a/storage/perfschema/pfs_events_statements.h 2011-10-04 12:16:34 +0000
+++ b/storage/perfschema/pfs_events_statements.h 2011-10-13 10:49:15 +0000
@@ -23,31 +23,13 @@
#include "pfs_column_types.h"
#include "pfs_events.h"
+#include "pfs_digest.h"
struct PFS_thread;
struct PFS_account;
struct PFS_user;
struct PFS_host;
-/**
- Structure to store a MD5 hash value (digest) for a statement.
-*/
-struct {
- unsigned char m_md5[16];
- }typedef PFS_digest_hash;
-
-/**
- Structure to store token count/array for a statement
- on which digest is to be calculated.
-*/
-#define PFS_MAX_TOKEN_COUNT 1024
-struct {
- uint m_token_count;
- uint m_token_array[PFS_MAX_TOKEN_COUNT];
- PFS_digest_hash m_digest_hash;
- } typedef PFS_digest_storage;
-
-
/** A statement record. */
struct PFS_events_statements : public PFS_events
{
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-wl5767 branch (mayank.prasad:3388 to 3389) | Mayank Prasad | 13 Oct |
