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
871ea8a7
Commit
871ea8a7
authored
May 28, 2009
by
Sergey Glukhov
Browse files
Options
Browse Files
Download
Plain Diff
5.0-bugteam->5.1-bugteam merge
parents
beb0e1a3
394f6ba4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
2 deletions
+10
-2
client/mysql.cc
client/mysql.cc
+2
-2
mysql-test/r/mysql.result
mysql-test/r/mysql.result
+1
-0
mysql-test/t/mysql.test
mysql-test/t/mysql.test
+7
-0
No files found.
client/mysql.cc
View file @
871ea8a7
...
@@ -1979,7 +1979,7 @@ static COMMANDS *find_command(char *name,char cmd_char)
...
@@ -1979,7 +1979,7 @@ static COMMANDS *find_command(char *name,char cmd_char)
*/
*/
if
(
strstr
(
name
,
"
\\
g"
)
||
(
strstr
(
name
,
delimiter
)
&&
if
(
strstr
(
name
,
"
\\
g"
)
||
(
strstr
(
name
,
delimiter
)
&&
!
(
strlen
(
name
)
>=
9
&&
!
(
strlen
(
name
)
>=
9
&&
!
my_strnncoll
(
charset_info
,
!
my_strnncoll
(
&
my_charset_latin1
,
(
uchar
*
)
name
,
9
,
(
uchar
*
)
name
,
9
,
(
const
uchar
*
)
"delimiter"
,
(
const
uchar
*
)
"delimiter"
,
9
))))
9
))))
...
@@ -2000,7 +2000,7 @@ static COMMANDS *find_command(char *name,char cmd_char)
...
@@ -2000,7 +2000,7 @@ static COMMANDS *find_command(char *name,char cmd_char)
{
{
if
(
commands
[
i
].
func
&&
if
(
commands
[
i
].
func
&&
((
name
&&
((
name
&&
!
my_strnncoll
(
charset_info
,(
uchar
*
)
name
,
len
,
!
my_strnncoll
(
&
my_charset_latin1
,
(
uchar
*
)
name
,
len
,
(
uchar
*
)
commands
[
i
].
name
,
len
)
&&
(
uchar
*
)
commands
[
i
].
name
,
len
)
&&
!
commands
[
i
].
name
[
len
]
&&
!
commands
[
i
].
name
[
len
]
&&
(
!
end
||
(
end
&&
commands
[
i
].
takes_params
)))
||
(
!
end
||
(
end
&&
commands
[
i
].
takes_params
)))
||
...
...
mysql-test/r/mysql.result
View file @
871ea8a7
...
@@ -198,6 +198,7 @@ COUNT (*)
...
@@ -198,6 +198,7 @@ COUNT (*)
1
1
COUNT (*)
COUNT (*)
1
1
ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (1)
End of 5.0 tests
End of 5.0 tests
WARNING: --server-arg option not supported in this configuration.
WARNING: --server-arg option not supported in this configuration.
Warning (Code 1286): Unknown table engine 'nonexistent'
Warning (Code 1286): Unknown table engine 'nonexistent'
...
...
mysql-test/t/mysql.test
View file @
871ea8a7
...
@@ -349,6 +349,13 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug31060.sql;
...
@@ -349,6 +349,13 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug31060.sql;
--
exec
$MYSQL
--
ignore
-
spaces
-
e
"SELECT COUNT (*)"
--
exec
$MYSQL
--
ignore
-
spaces
-
e
"SELECT COUNT (*)"
--
exec
$MYSQL
-
b
-
i
-
e
"SELECT COUNT (*)"
--
exec
$MYSQL
-
b
-
i
-
e
"SELECT COUNT (*)"
#
# Bug#37268 'binary' character set makes CLI-internal commands case sensitive
#
--
error
1
--
exec
$MYSQL
--
default
-
character
-
set
=
binary
test
-
e
"CONNECT test invalid_hostname"
2
>&
1
--
exec
$MYSQL
--
default
-
character
-
set
=
binary
test
-
e
"DELIMITER //"
2
>&
1
--
echo
End
of
5.0
tests
--
echo
End
of
5.0
tests
#
#
...
...
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