mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
regression introduced by MDEV-14448
This commit is contained in:
@ -2136,10 +2136,7 @@ static int read_and_execute(bool interactive)
|
|||||||
the readline/libedit library.
|
the readline/libedit library.
|
||||||
*/
|
*/
|
||||||
if (line)
|
if (line)
|
||||||
{
|
|
||||||
free(line);
|
free(line);
|
||||||
glob_buffer.length(0);
|
|
||||||
}
|
|
||||||
line= readline(prompt);
|
line= readline(prompt);
|
||||||
#ifdef USE_LIBEDIT_INTERFACE
|
#ifdef USE_LIBEDIT_INTERFACE
|
||||||
/*
|
/*
|
||||||
|
24
mysql-test/main/mysql-interactive.result
Normal file
24
mysql-test/main/mysql-interactive.result
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
#
|
||||||
|
# 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)]>
|
29
mysql-test/main/mysql-interactive.test
Normal file
29
mysql-test/main/mysql-interactive.test
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
--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;
|
Reference in New Issue
Block a user