diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-09-04 12:25:54 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-09-04 12:25:54 -0600 |
| commit | c458f7f6a3b6cf6754c9843d6801c9b0f86ffe48 (patch) | |
| tree | e709d9cce3d8a2b77acda70637623f1faf7eb64f /sql/rpl_utility.h | |
| parent | 943ed8fe354734fa52417bf36920462ab23756d3 (diff) | |
| parent | 6bfae914a2a0e7661c75c030b0bf88c8490323ed (diff) | |
| download | mariadb-git-c458f7f6a3b6cf6754c9843d6801c9b0f86ffe48.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
mysql-test/r/sp.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
Diffstat (limited to 'sql/rpl_utility.h')
| -rw-r--r-- | sql/rpl_utility.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_utility.h b/sql/rpl_utility.h index 4fd38022da0..26edbdd1405 100644 --- a/sql/rpl_utility.h +++ b/sql/rpl_utility.h @@ -241,8 +241,8 @@ public: private: ulong m_size; // Number of elements in the types array field_type *m_type; // Array of type descriptors - uint16 *m_field_metadata; uint m_field_metadata_size; + uint16 *m_field_metadata; uchar *m_null_bits; uchar *m_memory; }; |