MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)

Some default_charset_info were removed

5 files changed, 9 insertions, 9 deletions

diff --git a/myisam/mi_create.c b/myisam/mi_create.c
index 964845cc051..26bb23c3a7f 100644
--- a/myisam/mi_create.c
+++ b/myisam/mi_create.c
@@ -441,7 +441,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
   mi_int2store(share.state.header.base_info_length,MI_BASE_INFO_SIZE);
   mi_int2store(share.state.header.base_pos,base_pos);
   share.state.header.language= (ci->language ?
-				ci->language : MY_CHARSET_CURRENT);
+				ci->language : default_charset_info->number);
   share.state.header.max_block_size=max_key_block_length/MI_MIN_KEY_BLOCK_LENGTH;
 
   share.state.dellink = HA_OFFSET_ERROR;
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;
diff --git a/myisam/mi_test2.c b/myisam/mi_test2.c
index 75adf74294f..8dc279b6d97 100644
--- a/myisam/mi_test2.c
+++ b/myisam/mi_test2.c
@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
   keyinfo[0].seg[0].start=0;
   keyinfo[0].seg[0].length=6;
   keyinfo[0].seg[0].type=HA_KEYTYPE_TEXT;
-  keyinfo[0].seg[0].language=MY_CHARSET_CURRENT;
+  keyinfo[0].seg[0].language= default_charset_info->number;
   keyinfo[0].seg[0].flag=(uint8) pack_seg;
   keyinfo[0].seg[0].null_bit=0;
   keyinfo[0].seg[0].null_pos=0;
@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
   keyinfo[3].seg[0].start=0;
   keyinfo[3].seg[0].length=reclength-(use_blob ? 8 : 0);
   keyinfo[3].seg[0].type=HA_KEYTYPE_TEXT;
-  keyinfo[3].seg[0].language=MY_CHARSET_CURRENT;
+  keyinfo[3].seg[0].language=default_charset_info->number;
   keyinfo[3].seg[0].flag=(uint8) pack_seg;
   keyinfo[3].seg[0].null_bit=0;
   keyinfo[3].seg[0].null_pos=0;
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
   keyinfo[4].seg[0].start=0;
   keyinfo[4].seg[0].length=5;
   keyinfo[4].seg[0].type=HA_KEYTYPE_TEXT;
-  keyinfo[4].seg[0].language=MY_CHARSET_CURRENT;
+  keyinfo[4].seg[0].language=default_charset_info->number;
   keyinfo[4].seg[0].flag=0;
   keyinfo[4].seg[0].null_bit=0;
   keyinfo[4].seg[0].null_pos=0;
@@ -146,7 +146,7 @@ int main(int argc, char *argv[])
   keyinfo[5].seg[0].start=0;
   keyinfo[5].seg[0].length=4;
   keyinfo[5].seg[0].type=HA_KEYTYPE_TEXT;
-  keyinfo[5].seg[0].language=MY_CHARSET_CURRENT;
+  keyinfo[5].seg[0].language=default_charset_info->number;
   keyinfo[5].seg[0].flag=pack_seg;
   keyinfo[5].seg[0].null_bit=0;
   keyinfo[5].seg[0].null_pos=0;
diff --git a/myisam/rt_test.c b/myisam/rt_test.c
index 8bb4687e967..61890bfded1 100644
--- a/myisam/rt_test.c
+++ b/myisam/rt_test.c
@@ -98,7 +98,7 @@ int run_test(const char *filename)
     keyinfo[0].seg[i].length=key_length;
     keyinfo[0].seg[i].null_bit= null_fields ? 2 : 0;
     keyinfo[0].seg[i].null_pos=0;
-    keyinfo[0].seg[i].language=MY_CHARSET_CURRENT;
+    keyinfo[0].seg[i].language=default_charset_info->number;
   }
   
   
diff --git a/myisam/sp_test.c b/myisam/sp_test.c
index 7021cb4a8ee..c4847217efd 100644
--- a/myisam/sp_test.c
+++ b/myisam/sp_test.c
@@ -96,7 +96,7 @@ int run_test(const char *filename)
   keyinfo[0].seg[0].length=1; /* Spatial ignores it anyway */
   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;
   keyinfo[0].seg[0].bit_start=4; /* Long BLOB */