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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
a482e76e
Commit
a482e76e
authored
Jun 20, 2016
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix a mysql-5.5.50 merge: mysqlcheck
quote identifiers correctly
parent
95bf696d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
2 deletions
+12
-2
client/mysqlcheck.c
client/mysqlcheck.c
+2
-2
mysql-test/r/mysqlcheck.result
mysql-test/r/mysqlcheck.result
+5
-0
mysql-test/t/mysqlcheck.test
mysql-test/t/mysqlcheck.test
+5
-0
No files found.
client/mysqlcheck.c
View file @
a482e76e
...
@@ -756,7 +756,7 @@ static int fix_table_storage_name(const char *name)
...
@@ -756,7 +756,7 @@ static int fix_table_storage_name(const char *name)
if
(
strncmp
(
name
,
"#mysql50#"
,
9
))
if
(
strncmp
(
name
,
"#mysql50#"
,
9
))
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
my_snprintf
(
qbuf
,
sizeof
(
qbuf
),
"RENAME TABLE
`%s` TO `%s`
"
,
my_snprintf
(
qbuf
,
sizeof
(
qbuf
),
"RENAME TABLE
%`s TO %`s
"
,
name
,
name
+
9
);
name
,
name
+
9
);
rc
=
run_query
(
qbuf
);
rc
=
run_query
(
qbuf
);
...
@@ -773,7 +773,7 @@ static int fix_database_storage_name(const char *name)
...
@@ -773,7 +773,7 @@ static int fix_database_storage_name(const char *name)
if
(
strncmp
(
name
,
"#mysql50#"
,
9
))
if
(
strncmp
(
name
,
"#mysql50#"
,
9
))
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
my_snprintf
(
qbuf
,
sizeof
(
qbuf
),
"ALTER DATABASE
`%s`
UPGRADE DATA DIRECTORY "
my_snprintf
(
qbuf
,
sizeof
(
qbuf
),
"ALTER DATABASE
%`s
UPGRADE DATA DIRECTORY "
"NAME"
,
name
);
"NAME"
,
name
);
rc
=
run_query
(
qbuf
);
rc
=
run_query
(
qbuf
);
if
(
verbose
)
if
(
verbose
)
...
...
mysql-test/r/mysqlcheck.result
View file @
a482e76e
...
@@ -339,3 +339,8 @@ Repairing views
...
@@ -339,3 +339,8 @@ Repairing views
test.v1 OK
test.v1 OK
drop view v1;
drop view v1;
drop table t1;
drop table t1;
create table `#mysql50#t1``1` (a int) engine=myisam;
show tables;
Tables_in_test
t1`1
drop table `t1``1`;
mysql-test/t/mysqlcheck.test
View file @
a482e76e
...
@@ -350,3 +350,8 @@ create table t1(a int);
...
@@ -350,3 +350,8 @@ create table t1(a int);
--
exec
$MYSQL_CHECK
--
process
-
views
--
check
-
upgrade
--
auto
-
repair
test
--
exec
$MYSQL_CHECK
--
process
-
views
--
check
-
upgrade
--
auto
-
repair
test
drop
view
v1
;
drop
view
v1
;
drop
table
t1
;
drop
table
t1
;
create
table
`#mysql50#t1``1`
(
a
int
)
engine
=
myisam
;
--
exec
$MYSQL_CHECK
--
fix
-
table
-
names
--
databases
test
show
tables
;
drop
table
`t1``1`
;
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