Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
f40047df
Commit
f40047df
authored
17 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge pilot.blaudden:/home/msvensson/mysql/bug28401/my50-bug28401
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
parents
ca633f5f
f52f931f
Branches unavailable
Tags unavailable
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
0 deletions
+33
-0
mysql-test/r/mysql_upgrade.result
mysql-test/r/mysql_upgrade.result
+19
-0
mysql-test/t/mysql_upgrade.test
mysql-test/t/mysql_upgrade.test
+13
-0
scripts/mysql_system_tables_fix.sql
scripts/mysql_system_tables_fix.sql
+1
-0
No files found.
mysql-test/r/mysql_upgrade.result
View file @
f40047df
...
...
@@ -60,3 +60,22 @@ DROP USER mysqltest1@'%';
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;
This diff is collapsed.
Click to expand it.
mysql-test/t/mysql_upgrade.test
View file @
f40047df
...
...
@@ -55,3 +55,16 @@ DROP USER mysqltest1@'%';
--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 diff is collapsed.
Click to expand it.
scripts/mysql_system_tables_fix.sql
View file @
f40047df
...
...
@@ -9,6 +9,7 @@
#
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
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment