diff options
| author | unknown <monty@narttu.mysql.fi> | 2007-04-05 15:05:10 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2007-04-05 15:05:10 +0300 |
| commit | 5bef77a33b79e62327348e9878cec2eb3212273c (patch) | |
| tree | 5b67d8cb58129c53647524366a12d5b054e61c2e /storage/maria/ma_test2.c | |
| parent | 1a77ebd14c5ba2244db4b515c367e62bf97e8d8e (diff) | |
| parent | 0abffa05a60e3fccb31a81828fdc99986ce4b7c5 (diff) | |
| download | mariadb-git-5bef77a33b79e62327348e9878cec2eb3212273c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into mysql.com:/home/my/mysql-maria
BitKeeper/etc/ignore:
auto-union
BUILD/SETUP.sh:
Auto merged
mysql-test/lib/init_db.sql:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/lib/mtr_diff.pl:
Auto merged
mysql-test/lib/mtr_gcov.pl:
Auto merged
mysql-test/lib/mtr_gprof.pl:
Auto merged
mysql-test/lib/mtr_im.pl:
Auto merged
mysql-test/lib/mtr_io.pl:
Auto merged
mysql-test/lib/mtr_match.pl:
Auto merged
mysql-test/lib/mtr_misc.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/lib/mtr_stress.pl:
Auto merged
mysql-test/lib/mtr_timer.pl:
Auto merged
mysql-test/lib/mtr_unique.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/query_cache_notembedded.test:
Auto merged
sql/filesort.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_table.cc:
Auto merged
storage/maria/ha_maria.h:
Auto merged
storage/maria/ma_bitmap.c:
Auto merged
storage/maria/ma_blockrec.c:
Auto merged
storage/maria/ma_blockrec.h:
Auto merged
storage/maria/ma_check.c:
Auto merged
storage/maria/ma_checksum.c:
Auto merged
storage/maria/ma_create.c:
Auto merged
storage/maria/ma_delete.c:
Auto merged
storage/maria/ma_delete_all.c:
Auto merged
storage/maria/ma_extra.c:
Auto merged
storage/maria/ma_info.c:
Auto merged
storage/maria/ma_search.c:
Auto merged
storage/maria/ma_test2.c:
Auto merged
storage/maria/ma_write.c:
Auto merged
storage/maria/maria_def.h:
Auto merged
storage/myisam/mi_create.c:
Auto merged
storage/myisam/mi_test2.c:
Auto merged
sql/share/errmsg.txt:
Use remote version
mysql-test/include/varchar.inc:
Manual merge (take changes from remote tree)
storage/maria/ha_maria.cc:
Manual merge
Diffstat (limited to 'storage/maria/ma_test2.c')
| -rw-r--r-- | storage/maria/ma_test2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/maria/ma_test2.c b/storage/maria/ma_test2.c index 4ec5afd35e7..92fa5b63650 100644 --- a/storage/maria/ma_test2.c +++ b/storage/maria/ma_test2.c @@ -814,8 +814,7 @@ int main(int argc, char *argv[]) { ulong blob_length,pos; uchar *ptr; - longget(blob_length,read_record+blob_pos+4); - ptr=(uchar*) blob_length; + memcpy_fixed(&ptr, read_record+blob_pos+4, sizeof(ptr)); longget(blob_length,read_record+blob_pos); for (pos=0 ; pos < blob_length ; pos++) { |