diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-01-16 20:16:35 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-01-16 20:16:35 +0100 |
| commit | 38e3ae155db08ab2e9e5c267f05f89bec0542b33 (patch) | |
| tree | 7289bbef1ba3f495aa5c7cdb7d0a3f993a5bbc80 /sql/sql_class.h | |
| parent | c56483d972d023105fbcb0f47af0042ee092657c (diff) | |
| parent | ed1ba992c1d3c3ecbe6a2769c51ceb5d27606d3b (diff) | |
| download | mariadb-git-38e3ae155db08ab2e9e5c267f05f89bec0542b33.tar.gz | |
mysql-5.5 merge
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index b39f0506ee1..2538e73572a 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -166,9 +166,6 @@ typedef struct st_user_var_events bool unsigned_flag; } BINLOG_USER_VAR_EVENT; -#define RP_LOCK_LOG_IS_ALREADY_LOCKED 1 -#define RP_FORCE_ROTATE 2 -#define RP_BINLOG_CHECKSUM_ALG_CHANGE 4 /* The COPY_INFO structure is used by INSERT/REPLACE code. The schema of the row counting by the INSERT/INSERT ... ON DUPLICATE KEY @@ -456,8 +453,8 @@ typedef struct system_variables */ ulong dynamic_variables_version; char* dynamic_variables_ptr; - uint dynamic_variables_head; /* largest valid variable offset */ - uint dynamic_variables_size; /* how many bytes are in use */ + uint dynamic_variables_head; /* largest valid variable offset */ + uint dynamic_variables_size; /* how many bytes are in use */ ulonglong max_heap_table_size; ulonglong tmp_table_size; |