Skip to content

M
MariaDB
Commit 1dbd4148 authored by marko's avatar marko
Browse files
Options

branches/zip: Fix errors made in r1672.

parent a3566c2c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
row/row0mysql.c
View file @ 1dbd4148
...@@ -220,7 +220,7 @@ row_mysql_read_blob_ref( ...@@ -220,7 +220,7 @@ row_mysql_read_blob_ref(
*len = mach_read_from_n_little_endian(ref, col_len - 8); *len = mach_read_from_n_little_endian(ref, col_len - 8);
ut_memcpy(&data, ref + col_len - 8, sizeof *data); memcpy(&data, ref + col_len - 8, sizeof data);
return(data); return(data);
} }
...@@ -280,7 +280,7 @@ row_mysql_store_col_in_innobase_format( ...@@ -280,7 +280,7 @@ row_mysql_store_col_in_innobase_format(
for (;;) { for (;;) {
p--; p--;
*p = *mysql_data; *p = *mysql_data;
if (ptr == buf) { if (p == buf) {
break; break;
} }
mysql_data++; mysql_data++;
...@@ -288,11 +288,11 @@ row_mysql_store_col_in_innobase_format( ...@@ -288,11 +288,11 @@ row_mysql_store_col_in_innobase_format(
if (!(dtype->prtype & DATA_UNSIGNED)) { if (!(dtype->prtype & DATA_UNSIGNED)) {
*p ^= 128; *buf ^= 128;
} }
ptr = buf;
buf += col_len; buf += col_len;
ptr = p;
} else if ((type == DATA_VARCHAR } else if ((type == DATA_VARCHAR
|| type == DATA_VARMYSQL || type == DATA_VARMYSQL
|| type == DATA_BINARY)) { || type == DATA_BINARY)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7