diff options
author | Alexander Nozdrin <alik@sun.com> | 2010-03-02 17:34:50 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2010-03-02 17:34:50 +0300 |
commit | c17e2664371c1643135f8cfc245b8c1ed4f59f3d (patch) | |
tree | b41651212156dfd684f8a54791bdf3b7cfc85c25 /sql/log_event_old.cc | |
parent | 5a05c470eeede16c33586f95e0bf555c80bd81fb (diff) | |
parent | c04e5bbe7069566b5842cc1f04687d5c964ab2ad (diff) | |
download | mariadb-git-c17e2664371c1643135f8cfc245b8c1ed4f59f3d.tar.gz |
Manual merge from mysql-next-mr.
Conflicts:
- sql/sql_base.cc
Diffstat (limited to 'sql/log_event_old.cc')
-rw-r--r-- | sql/log_event_old.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event_old.cc b/sql/log_event_old.cc index 2d559804534..9b46ad83b14 100644 --- a/sql/log_event_old.cc +++ b/sql/log_event_old.cc @@ -304,7 +304,7 @@ static bool record_compare(TABLE *table) */ bool result= FALSE; - uchar saved_x[2], saved_filler[2]; + uchar saved_x[2]= {0, 0}, saved_filler[2]= {0, 0}; if (table->s->null_bytes > 0) { |