diff options
| author | unknown <rburnett@bk-internal.mysql.com> | 2006-06-26 16:53:53 +0200 |
|---|---|---|
| committer | unknown <rburnett@bk-internal.mysql.com> | 2006-06-26 16:53:53 +0200 |
| commit | 17f724a18c4a97ad11030bd13b36859c7965c017 (patch) | |
| tree | 5f6e7a81821398fdbfbea180ece8b39210e6d267 /sql/field.h | |
| parent | dbc0a2e1c14acc37812ff9fd9ca1b87f87bf890d (diff) | |
| parent | a5e194ed526f6974bddc9e847f13d6a431e30b37 (diff) | |
| download | mariadb-git-17f724a18c4a97ad11030bd13b36859c7965c017.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h index d325f6b8e94..55f2c037109 100644 --- a/sql/field.h +++ b/sql/field.h @@ -824,7 +824,7 @@ public: if ((*null_value= is_null())) return 0; #ifdef WORDS_BIGENDIAN - if (table->s->db_low_byte_first) + if (table && table->s->db_low_byte_first) return sint4korr(ptr); #endif long tmp; |