From 1804046d78a4e4c8750aed1dfbffdd1f07fc7857 Mon Sep 17 00:00:00 2001
From: unknown <istruewing@stella.local>
Date: Thu, 24 Jan 2008 18:56:42 +0100
Subject: Bug#29182 - MyISAMCHK reports wrong character set

myisamchk did always show Character set: latin1_swedish_ci (8),
regardless what DEFAULT CHARSET the table had.

When the server created a MyISAM table, it did not copy the
characterset number into the MyISAM create info structure.

Added assignment of charset number to MI_CREATE_INFO.


mysql-test/r/myisam.result:
  Bug#29182 - MyISAMCHK reports wrong character set
  Added test result.
mysql-test/t/myisam.test:
  Bug#29182 - MyISAMCHK reports wrong character set
  Added test.
storage/myisam/ha_myisam.cc:
  Bug#29182 - MyISAMCHK reports wrong character set
  Added assignment of charset number to MI_CREATE_INFO.
---
 mysql-test/t/myisam.test | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'mysql-test/t/myisam.test')

diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
index bb2c295eac2..21ffa0683b6 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -1448,5 +1448,19 @@ CHECK TABLE t1;
 CHECK TABLE t1 EXTENDED;
 DROP TABLE t1;
 
+#
+# Bug#29182 - MyISAMCHK reports wrong character set
+#
+CREATE TABLE t1 (
+  c1 VARCHAR(10) NOT NULL,
+  c2 CHAR(10) DEFAULT NULL,
+  c3 VARCHAR(10) NOT NULL,
+  KEY (c1),
+  KEY (c2)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--exec $MYISAMCHK -d $MYSQLTEST_VARDIR/master-data/test/t1
+DROP TABLE t1;
+
 --echo End of 5.1 tests
 
-- 
cgit v1.2.1