MDEV-12645 - mysql_install_db: no install test db option

Added --skip-test-db option to mysql_install_db. If specified, no test
database created and relevant grants issued.

Removed --skip-auth-anonymous-user option of mysql_install_db. Now it is
covered by --skip-test-db.

Dropped some Debian patches that did the same.

Removed unused make_win_bin_dist.1, make_win_bin_dist and
mysql_install_db.pl.in.

debian/mariadb-server-10.3.install

@@ -98,4 +98,5 @@ usr/share/mysql/mysql_performance_tables.sql
 usr/share/mysql/mysql_system_tables.sql
 usr/share/mysql/mysql_system_tables_data.sql
 usr/share/mysql/mysql_test_data_timezone.sql
+usr/share/mysql/mysql_test_db.sql
 usr/share/mysql/wsrep_notify

debian/mariadb-server-10.3.postinst

@@ -141,7 +141,9 @@ EOF
     # Debian: beware of the bashisms...
     # Debian: can safely run on upgrades with existing databases
     set +e
-    bash /usr/bin/mysql_install_db --rpm --cross-bootstrap --user=mysql --disable-log-bin 2>&1 | $ERR_LOGGER
+    bash /usr/bin/mysql_install_db --rpm --cross-bootstrap --user=mysql \
+                                   --disable-log-bin --skip-test-db 2>&1 | \
+                                   $ERR_LOGGER
     set -e
 
 

debian/patches/00list

@@ -1,5 +1,2 @@
-33_scripts__mysql_create_system_tables__no_test.dpatch
 38_scripts__mysqld_safe.sh__signals.dpatch
-41_scripts__mysql_install_db.sh__no_test.dpatch
-50_mysql-test__db_test.dpatch
 61_replace_dash_with_bash_mbug675185.dpatch

mysql-test/main/ctype_create.result

@@ -83,6 +83,8 @@ USE test;
 #
 # MDEV-7387 Alter table xxx CHARACTER SET utf8, CONVERT TO CHARACTER SET latin1 should fail
 #
+CREATE DATABASE tmp DEFAULT CHARACTER SET latin5;
+USE tmp;
 CREATE TABLE t1 (a VARCHAR(10)) CHARACTER SET DEFAULT, CHARACTER SET utf8;
 ERROR HY000: Conflicting declarations: 'CHARACTER SET DEFAULT' and 'CHARACTER SET utf8'
 CREATE TABLE t1 (a VARCHAR(10)) CHARACTER SET utf8, CHARACTER SET DEFAULT;
@@ -105,6 +107,8 @@ ERROR HY000: Conflicting declarations: 'CHARACTER SET latin5' and 'CHARACTER SET
 ALTER TABLE t1 CONVERT TO CHARACTER SET DEFAULT, CHARACTER SET latin1;
 ERROR HY000: Conflicting declarations: 'CHARACTER SET latin5' and 'CHARACTER SET latin1'
 DROP TABLE t1;
+DROP DATABASE tmp;
+USE test;
 #
 # End of 10.0 tests
 #

mysql-test/main/ctype_create.test

@@ -114,6 +114,8 @@ USE test;
 --echo #
 --echo # MDEV-7387 Alter table xxx CHARACTER SET utf8, CONVERT TO CHARACTER SET latin1 should fail
 --echo #
+CREATE DATABASE tmp DEFAULT CHARACTER SET latin5;
+USE tmp;
 --error ER_CONFLICTING_DECLARATIONS
 CREATE TABLE t1 (a VARCHAR(10)) CHARACTER SET DEFAULT, CHARACTER SET utf8;
 --error ER_CONFLICTING_DECLARATIONS
@@ -137,6 +139,8 @@ ALTER TABLE t1 CONVERT TO CHARACTER SET DEFAULT, CHARACTER SET utf8;
 --error ER_CONFLICTING_DECLARATIONS
 ALTER TABLE t1 CONVERT TO CHARACTER SET DEFAULT, CHARACTER SET latin1;
 DROP TABLE t1;
+DROP DATABASE tmp;
+USE test;
 
 --echo #
 --echo # End of 10.0 tests

mysql-test/main/ctype_latin1_de.result

@@ -1,3 +1,5 @@
+create database latin1_german2_ci default character set latin1 collate latin1_german2_ci;
+use latin1_german2_ci;
 set names latin1;
 set @@collation_connection=latin1_german2_ci;
 select @@collation_connection;
@@ -139,7 +141,7 @@ a
 a
 check table t1;
 Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
+latin1_german2_ci.t1	check	status	OK
 select * from t1 where a like "�%";
 a	b
 �	1
@@ -835,3 +837,5 @@ hex(weight_string('x
 #
 # End of 5.6 tests
 #
+drop database latin1_german2_ci;
+use test;

mysql-test/main/ctype_latin1_de.test

@@ -1,6 +1,8 @@
 #
 # Test latin_de character set
 #
+create database latin1_german2_ci default character set latin1 collate latin1_german2_ci;
+use latin1_german2_ci;
 
 set names latin1;
 set @@collation_connection=latin1_german2_ci;
@@ -180,3 +182,6 @@ select hex(weight_string('x
 --echo #
 --echo # End of 5.6 tests
 --echo #
+
+drop database latin1_german2_ci;
+use test;

mysql-test/main/ctype_ucs.result

@@ -205,6 +205,7 @@ DROP TABLE t1;
 #   and reverse() function
 #
 # Problem # 1 (original report): wrong parsing of ucs2 data
+SET character_set_connection=ucs2;
 SELECT '00' UNION SELECT '10' INTO OUTFILE 'tmpp.txt';
 CREATE TABLE t1(a INT);
 LOAD DATA INFILE 'tmpp.txt' INTO TABLE t1 CHARACTER SET ucs2

mysql-test/main/ctype_ucs.test

@@ -74,6 +74,7 @@ DROP TABLE t1;
 --echo #
 
 --echo # Problem # 1 (original report): wrong parsing of ucs2 data
+SET character_set_connection=ucs2;
 SELECT '00' UNION SELECT '10' INTO OUTFILE 'tmpp.txt';
 CREATE TABLE t1(a INT);
 LOAD DATA INFILE 'tmpp.txt' INTO TABLE t1 CHARACTER SET ucs2

mysql-test/main/drop_bad_db_type.result

@@ -26,8 +26,10 @@ Level	Warning
 Code	1286
 Message	Unknown storage engine 'ARCHIVE'
 install soname 'ha_archive';
+db.opt
 t1.ARZ
 t1.frm
 drop table t1;
+db.opt
 uninstall soname 'ha_archive';
 set debug_dbug='-d,unstable_db_type';