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
e5147c81
Commit
e5147c81
authored
Jan 30, 2024
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
regression introduced by MDEV-14448
parent
d1744ee7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
53 additions
and
3 deletions
+53
-3
client/mysql.cc
client/mysql.cc
+0
-3
mysql-test/main/mysql-interactive.result
mysql-test/main/mysql-interactive.result
+24
-0
mysql-test/main/mysql-interactive.test
mysql-test/main/mysql-interactive.test
+29
-0
No files found.
client/mysql.cc
View file @
e5147c81
...
...
@@ -2136,10 +2136,7 @@ static int read_and_execute(bool interactive)
the readline/libedit library.
*/
if
(
line
)
{
free
(
line
);
glob_buffer
.
length
(
0
);
}
line
=
readline
(
prompt
);
#ifdef USE_LIBEDIT_INTERFACE
/*
...
...
mysql-test/main/mysql-interactive.result
0 → 100644
View file @
e5147c81
#
# regression introduced by MDEV-14448
#
delimiter $
select 1;
$
Welcome to the MariaDB monitor. Commands end with ; or \g.
Your MariaDB connection id is X
Server version: Y
Copyright (c) 2000, 2018, Oracle, MariaDB Corporation Ab and others.
Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.
MariaDB [(none)]> delimiter $
MariaDB [(none)]> select 1;
-> $
+---+
| 1 |
+---+
| 1 |
+---+
1 row in set
MariaDB [(none)]>
\ No newline at end of file
mysql-test/main/mysql-interactive.test
0 → 100644
View file @
e5147c81
--
echo
#
--
echo
# regression introduced by MDEV-14448
--
echo
#
source
include
/
not_embedded
.
inc
;
source
include
/
not_windows
.
inc
;
error
0
,
1
;
exec
$MYSQL
-
V
|
grep
-
q
readline
;
if
(
$sys_errno
==
1
)
{
# strangely enough
skip
does
not
work
with
libedit
;
}
write_file
$MYSQL_TMP_DIR
/
mysql_in
;
delimiter
$
select
1
;
$
EOF
let
TERM
=
dumb
;
replace_regex
/
id
is
\d
+/
id
is
X
/
/
Server
version
:
.*/
Server
version
:
Y
/
/
\
(
\d
+
\
.
\d
+
sec
\
)
//;
error
0
,
127
;
exec
socat
EXEC
:
"
$MYSQL
"
,
pty
STDIO
<
$MYSQL_TMP_DIR
/
mysql_in
;
if
(
$sys_errno
==
127
)
{
remove_file
$MYSQL_TMP_DIR
/
mysql_in
;
skip
no
socat
;
}
remove_file
$MYSQL_TMP_DIR
/
mysql_in
;
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