summaryrefslogtreecommitdiff
path: root/include/myisam.h
diff options
context:
space:
mode:
authorunknown <jani@a88-113-38-195.elisa-laajakaista.fi>2007-12-16 20:37:22 +0200
committerunknown <jani@a88-113-38-195.elisa-laajakaista.fi>2007-12-16 20:37:22 +0200
commitbe71f3ccb61d3c4f1ebc096ba4e5e1563f578681 (patch)
tree9bcd5381887297186189e3c46b4a7da678976e8b /include/myisam.h
parentdd3bba09f22ff3a48443454f2927dc22fd43da05 (diff)
downloadmariadb-git-be71f3ccb61d3c4f1ebc096ba4e5e1563f578681.tar.gz
Fixed after-merge problems.
Diffstat (limited to 'include/myisam.h')
-rw-r--r--include/myisam.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/myisam.h b/include/myisam.h
index ee0bf43782b..c49c094e757 100644
--- a/include/myisam.h
+++ b/include/myisam.h
@@ -341,7 +341,7 @@ typedef struct st_mi_sort_param
uchar *rec_buff;
void *wordlist, *wordptr;
MEM_ROOT wordroot;
- char *record;
+ uchar *record;
MY_TMPDIR *tmpdir;
/*