diff options
| author | Luis Soares <luis.soares@sun.com> | 2009-01-23 13:22:05 +0100 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2009-01-23 13:22:05 +0100 |
| commit | 239891069d1eb001a821c5d909c2644b15dde4cd (patch) | |
| tree | 62fe82ffb4b2f249d2e0c6686acb8c060ed5f0bd /sql/field.h | |
| parent | 866f2c0f58335dafcf816c08e667e856f6a99e38 (diff) | |
| parent | 56bcb2962306f6c19d90a6c080e3064b7bc661e1 (diff) | |
| download | mariadb-git-239891069d1eb001a821c5d909c2644b15dde4cd.tar.gz | |
merge: 5.1 -> 5.1-rpl
conflicts:
Text conflict in client/mysqltest.cc
Text conflict in mysql-test/include/wait_until_connected_again.inc
Text conflict in mysql-test/lib/mtr_report.pm
Text conflict in mysql-test/mysql-test-run.pl
Text conflict in mysql-test/r/events_bugs.result
Text conflict in mysql-test/r/log_state.result
Text conflict in mysql-test/r/myisam_data_pointer_size_func.result
Text conflict in mysql-test/r/mysqlcheck.result
Text conflict in mysql-test/r/query_cache.result
Text conflict in mysql-test/r/status.result
Text conflict in mysql-test/suite/binlog/r/binlog_index.result
Text conflict in mysql-test/suite/binlog/r/binlog_innodb.result
Text conflict in mysql-test/suite/rpl/r/rpl_packet.result
Text conflict in mysql-test/suite/rpl/t/rpl_packet.test
Text conflict in mysql-test/t/disabled.def
Text conflict in mysql-test/t/events_bugs.test
Text conflict in mysql-test/t/log_state.test
Text conflict in mysql-test/t/myisam_data_pointer_size_func.test
Text conflict in mysql-test/t/mysqlcheck.test
Text conflict in mysql-test/t/query_cache.test
Text conflict in mysql-test/t/rpl_init_slave_func.test
Text conflict in mysql-test/t/status.test
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 d24dd9355b0..5136f760fc1 100644 --- a/sql/field.h +++ b/sql/field.h @@ -209,7 +209,7 @@ public: memcpy(ptr, ptr + l_offset, pack_length()); if (null_ptr) *null_ptr= ((*null_ptr & (uchar) ~null_bit) | - null_ptr[l_offset] & null_bit); + (null_ptr[l_offset] & null_bit)); } virtual bool binary() const { return 1; } virtual bool zero_pack() const { return 1; } |