diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2009-09-08 15:38:40 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2009-09-08 15:38:40 +0200 |
| commit | deab1e9ce3dc073927f57ed62bc0fdcd2c663cc3 (patch) | |
| tree | 4f25c3eb7d54e9e85ad27872d592dc8c9d70f425 /storage/innobase/handler | |
| parent | 29d0fa12f7770b67c4df00ab1b4de13e0bfdf8bb (diff) | |
| download | mariadb-git-deab1e9ce3dc073927f57ed62bc0fdcd2c663cc3.tar.gz | |
Some fixes to make 5.4.2-beta compile on the less common
platforms like AIX, HP-UX, and Solaris 8.
All these are upmerges from 5.1 which came too late to be
included when 5.4.2-beta was cloned, so they were applied
during the build phase.
Diffstat (limited to 'storage/innobase/handler')
| -rw-r--r-- | storage/innobase/handler/i_s.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc index c0d488d1c49..524fe696de2 100644 --- a/storage/innobase/handler/i_s.cc +++ b/storage/innobase/handler/i_s.cc @@ -69,14 +69,16 @@ do { \ #define STRUCT_FLD(name, value) value #endif -static const ST_FIELD_INFO END_OF_ST_FIELD_INFO = - {STRUCT_FLD(field_name, NULL), - STRUCT_FLD(field_length, 0), - STRUCT_FLD(field_type, MYSQL_TYPE_NULL), - STRUCT_FLD(value, 0), - STRUCT_FLD(field_flags, 0), - STRUCT_FLD(old_name, ""), - STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}; +/* Don't use a static const variable here, as some C++ compilers (notably +HPUX aCC: HP ANSI C++ B3910B A.03.65) can't handle it. */ +#define END_OF_ST_FIELD_INFO \ + {STRUCT_FLD(field_name, NULL), \ + STRUCT_FLD(field_length, 0), \ + STRUCT_FLD(field_type, MYSQL_TYPE_NULL), \ + STRUCT_FLD(value, 0), \ + STRUCT_FLD(field_flags, 0), \ + STRUCT_FLD(old_name, ""), \ + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)} /* Use the following types mapping: |