Merge pilot.blaudden:/home/msvensson/mysql/bug28401/my50-bug28401

Run mysql_upgrade with a non existing server socket

mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect

FATAL ERROR: Upgrade failed

set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE';

mysql.columns_priv                                 OK

mysql.db                                           OK

mysql.func                                         OK

mysql.help_category                                OK

mysql.help_keyword                                 OK

mysql.help_relation                                OK

mysql.help_topic                                   OK

mysql.host                                         OK

mysql.proc                                         OK

mysql.procs_priv                                   OK

mysql.tables_priv                                  OK

mysql.time_zone                                    OK

mysql.time_zone_leap_second                        OK

mysql.time_zone_name                               OK

mysql.time_zone_transition                         OK

mysql.time_zone_transition_type                    OK

mysql.user                                         OK

set GLOBAL sql_mode=default;

--replace_regex /.*mysqlcheck.*: Got/mysqlcheck: Got/ /\([0-9]*\)/(errno)/

--error 1

--exec $MYSQL_UPGRADE --skip-verbose --force --host=not_existing_host 2>&1

#

# Bug #28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE

#

# The SQL commands used by mysql_upgrade are written to be run

# with sql_mode set to '' - thus the scripts should change sql_mode

# for the session to make sure the SQL is legal.

# Test by setting sql_mode before running mysql_upgrade

set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE';

--exec $MYSQL_UPGRADE --skip-verbose --force 2>&1

eval set GLOBAL sql_mode=default;

# this sql script.

# On windows you should do 'mysql --force mysql < mysql_fix_privilege_tables.sql'

set sql_mode='';

set storage_engine=MyISAM;

ALTER TABLE user add File_priv enum('N','Y') COLLATE utf8_general_ci NOT NULL;