bench: Insert "SET NAMES utf8mb4" into initial dataset sql

isucon · Feb 4, 2018 · 2cdd4dc · 2cdd4dc
1 parent 40b6486
commit 2cdd4dc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -97,7 +97,7 @@ mysql> GRANT ALL on *.* TO isucon@'localhost';
 初期データ投入
 
 ```sh
-zcat ~/isubata/bench/isucon7q-initial-dataset.sql.gz | sudo mysql --default-character-set=utf8 isubata
+zcat ~/isubata/bench/isucon7q-initial-dataset.sql.gz | sudo mysql isubata
 ```
 
 デフォルトだとTCPが127.0.0.1しかbindしてないので、複数台構成に対応するには

diff --git a/bench/src/bench/dataset.go b/bench/src/bench/dataset.go
@@ -247,6 +247,7 @@ func GenerateInitialDataSetSQL(outputPath string) {
 	w := gzip.NewWriter(outFile)
 	defer w.Close()
 
+	fbadf(w, "SET NAMES utf8mb4;")
 	fbadf(w, "BEGIN;")
 
 	rnd := rand.New(rand.NewSource(3656))

diff --git a/provisioning/allinone/roles/mysql/tasks/main.yml b/provisioning/allinone/roles/mysql/tasks/main.yml
@@ -76,7 +76,7 @@
   #when: isubata_repository.changed
 
 - name: Import benchmark data
-  shell: zcat isucon7q-initial-dataset.sql.gz | mysql --default-character-set=utf8 isubata
+  shell: zcat isucon7q-initial-dataset.sql.gz | mysql isubata
   args:
     chdir: /home/isucon/isubata/bench/
   become: yes