set_default_charset() is not used anymore

Some system_charset_info were removed


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

2 files changed, 7 insertions, 6 deletions

diff --git a/heap/hp_test1.c b/heap/hp_test1.c
index 2e0a57a12d3..96399fe4f2e 100644
--- a/heap/hp_test1.c
+++ b/heap/hp_test1.c
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
   keyinfo[0].seg[0].type=HA_KEYTYPE_BINARY;
   keyinfo[0].seg[0].start=1;
   keyinfo[0].seg[0].length=6;
-  keyinfo[0].seg[0].charset=default_charset_info;
+  keyinfo[0].seg[0].charset= &my_charset_latin1;
   keyinfo[0].flag = HA_NOSAME;
   
   deleted=0;
diff --git a/heap/hp_test2.c b/heap/hp_test2.c
index 73e8039d125..09ade212fa6 100644
--- a/heap/hp_test2.c
+++ b/heap/hp_test2.c
@@ -64,6 +64,7 @@ int main(int argc, char *argv[])
   HA_KEYSEG keyseg[MAX_KEYS*5];
   HEAP_PTR position;
   HP_CREATE_INFO hp_create_info;
+  CHARSET_INFO *cs= &my_charset_latin1;
   MY_INIT(argv[0]);		/* init my_sys library & pthreads */
   LINT_INIT(position);
 
@@ -85,7 +86,7 @@ int main(int argc, char *argv[])
   keyinfo[0].seg[0].start=0;
   keyinfo[0].seg[0].length=6;
   keyinfo[0].seg[0].null_bit=0;
-  keyinfo[0].seg[0].charset=default_charset_info;
+  keyinfo[0].seg[0].charset=cs;
   keyinfo[1].seg=keyseg+1;
   keyinfo[1].keysegs=2;
   keyinfo[1].flag=0;
@@ -94,12 +95,12 @@ int main(int argc, char *argv[])
   keyinfo[1].seg[0].start=7;
   keyinfo[1].seg[0].length=6;
   keyinfo[1].seg[0].null_bit=0;
-  keyinfo[1].seg[0].charset=default_charset_info;
+  keyinfo[1].seg[0].charset=cs;
   keyinfo[1].seg[1].type=HA_KEYTYPE_TEXT;
   keyinfo[1].seg[1].start=0;			/* key in two parts */
   keyinfo[1].seg[1].length=6;
   keyinfo[1].seg[1].null_bit=0;
-  keyinfo[1].seg[1].charset=default_charset_info;
+  keyinfo[1].seg[1].charset=cs;
   keyinfo[2].seg=keyseg+3;
   keyinfo[2].keysegs=1;
   keyinfo[2].flag=HA_NOSAME;
@@ -108,7 +109,7 @@ int main(int argc, char *argv[])
   keyinfo[2].seg[0].start=12;
   keyinfo[2].seg[0].length=8;
   keyinfo[2].seg[0].null_bit=0;
-  keyinfo[2].seg[0].charset=default_charset_info;
+  keyinfo[2].seg[0].charset=cs;
   keyinfo[3].seg=keyseg+4;
   keyinfo[3].keysegs=1;
   keyinfo[3].flag=HA_NOSAME;
@@ -118,7 +119,7 @@ int main(int argc, char *argv[])
   keyinfo[3].seg[0].length=1;
   keyinfo[3].seg[0].null_bit=1;
   keyinfo[3].seg[0].null_pos=38;
-  keyinfo[3].seg[0].charset=default_charset_info;
+  keyinfo[3].seg[0].charset=cs;
 
   bzero((char*) key1,sizeof(key1));
   bzero((char*) key3,sizeof(key3));