diff options
| author | malff/marcsql@weblab.(none) <> | 2007-09-04 12:25:54 -0600 |
|---|---|---|
| committer | malff/marcsql@weblab.(none) <> | 2007-09-04 12:25:54 -0600 |
| commit | 0f58ed7e74db435bb6c7012c82a7a51693706e5c (patch) | |
| tree | e709d9cce3d8a2b77acda70637623f1faf7eb64f /sql/rpl_utility.h | |
| parent | 122f5f6cd0850fac8035f480fae4fba449b519dd (diff) | |
| parent | 11c97a264656913c51c1968de3d5376841bf75d6 (diff) | |
| download | mariadb-git-0f58ed7e74db435bb6c7012c82a7a51693706e5c.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
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; }; |