summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <monty@work.mysql.com>2001-09-20 19:51:48 +0200
committerunknown <monty@work.mysql.com>2001-09-20 19:51:48 +0200
commit0ef8576a179f3451209b2f60ee3c7e746a181d0a (patch)
treedc7b9cf75aa949aba5ea2ed1fe97768bc9320035 /sql
parent5dbd7397bd0d268b02d2aacb16b8c288fcfa2e93 (diff)
parent6ae952129f99ac15e4ce2cea7eaccf5ee77e600b (diff)
downloadmariadb-git-0ef8576a179f3451209b2f60ee3c7e746a181d0a.tar.gz
Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0 acinclude.m4: Auto merged sql-bench/server-cfg.sh: Auto merged
Diffstat (limited to 'sql')
-rw-r--r--sql/field.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 01178efbdb1..b34f58439db 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -4122,7 +4122,7 @@ ulonglong Field_blob::get_id(const char *from)
ulonglong id = 0;
ulong length=get_length(from);
if (length)
- uint8korr(id, from+packlength);
+ id=uint8korr(from+packlength);
return id;
}