summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2002-12-04 10:41:35 +0100
committerunknown <lenz@mysql.com>2002-12-04 10:41:35 +0100
commit4fb76fc70a26ddca0d016a0c598775cc4d574135 (patch)
tree72f3cd4f54045b51f6ccb8bafd84df89223671a1
parent451aff64e85c981a992c82edbddde7eb183e38f4 (diff)
parentfaefac308f722b9669bec622c34c269c9341e675 (diff)
downloadmariadb-git-4fb76fc70a26ddca0d016a0c598775cc4d574135.tar.gz
Merge lgrimmer@work.mysql.com:/home/bk/mysql
into mysql.com:/space/my/mysql-3.23
-rw-r--r--sql/sql_parse.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index fe7e98c7028..ddbc34b2c7e 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -768,8 +768,8 @@ bool do_command(THD *thd)
thread_safe_increment(com_other,&LOCK_thread_count);
slow_command = TRUE;
char* data = packet + 1;
- uint db_len = *data;
- uint tbl_len = *(data + db_len + 1);
+ uint db_len = *(uchar *)data;
+ uint tbl_len = *(uchar *)(data + db_len + 1);
char* db = sql_alloc(db_len + tbl_len + 2);
memcpy(db, data + 1, db_len);
char* tbl_name = db + db_len;