summaryrefslogtreecommitdiff
path: root/myisam/mi_test1.c
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2003-06-03 14:59:17 +0500
committerunknown <bar@bar.mysql.r18.ru>2003-06-03 14:59:17 +0500
commit93d3ba840d1fe746929c68c262d3337cf4f38fc0 (patch)
treef7bb603f0c1323874da13a5e0f5bc44f6781cada /myisam/mi_test1.c
parent4beedd513eecdc4f57715112c1496e976a2f079c (diff)
downloadmariadb-git-93d3ba840d1fe746929c68c262d3337cf4f38fc0.tar.gz
MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
Some default_charset_info were removed
Diffstat (limited to 'myisam/mi_test1.c')
-rw-r--r--myisam/mi_test1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/mi_test1.c b/myisam/mi_test1.c
index 6aa4b9cf9f1..5a6818b8a3e 100644
--- a/myisam/mi_test1.c
+++ b/myisam/mi_test1.c
@@ -99,7 +99,7 @@ static int run_test(const char *filename)
keyinfo[0].seg[0].length=key_length;
keyinfo[0].seg[0].null_bit= null_fields ? 2 : 0;
keyinfo[0].seg[0].null_pos=0;
- keyinfo[0].seg[0].language=MY_CHARSET_CURRENT;
+ keyinfo[0].seg[0].language= default_charset_info->number;
if (pack_seg & HA_BLOB_PART)
{
keyinfo[0].seg[0].bit_start=4; /* Length of blob length */
@@ -122,7 +122,7 @@ static int run_test(const char *filename)
uniqueseg[i].start=start;
start+=recinfo[i+1].length;
uniqueseg[i].length=recinfo[i+1].length;
- uniqueseg[i].language=MY_CHARSET_CURRENT;
+ uniqueseg[i].language= default_charset_info->number;
}
uniqueseg[0].type= key_type;
uniqueseg[0].null_bit= null_fields ? 2 : 0;