database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-35727 main.mysql-interactive fails in buildbot on debian

Browse Source 
fix failing main.mysql-interactive

* increase socat EOF timeout from 0.5s to 10s
* add an explicit exit to not wait 10s (or even 0.5s - the test now
  finishes in 0.15s)
* enable it for libedit
This commit is contained in:
Sergei Golubchik
2025-03-16 11:26:30 +01:00
parent 6aa860be27
commit 1cc138958e
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/main/mysql-interactive.result
View File

@@ -4,6 +4,7 @@
delimiter $ delimiter $
select 1; select 1;
$ $
exit
Welcome to the MariaDB monitor. Commands end with ; or \g. Welcome to the MariaDB monitor. Commands end with ; or \g.
Your MariaDB connection id is X Your MariaDB connection id is X
Server version: Y Server version: Y
@@ -21,4 +22,5 @@ MariaDB [(none)]> select 1;
+---+ +---+
1 row in set 1 row in set
MariaDB [(none)]> MariaDB [(none)]> exit
Bye

11
mysql-test/main/mysql-interactive.test
View File

@@ -6,23 +6,16 @@ source include/not_windows.inc;
# this would need an instrumented ncurses library # this would need an instrumented ncurses library
source include/not_msan.inc; source include/not_msan.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; write_file $MYSQL_TMP_DIR/mysql_in;
delimiter $ delimiter $
select 1; select 1;
$ $
exit
EOF EOF
let TERM=dumb; let TERM=dumb;
replace_regex /id is \d+/id is X/ /Server version: .*/Server version: Y/ / \(\d+\.\d+ sec\)//; replace_regex /id is \d+/id is X/ /Server version: .*/Server version: Y/ / \(\d+\.\d+ sec\)//;
error 0,127; error 0,127;
exec socat EXEC:"$MYSQL",pty STDIO < $MYSQL_TMP_DIR/mysql_in; exec socat -t10 EXEC:"$MYSQL",pty STDIO < $MYSQL_TMP_DIR/mysql_in;
if ($sys_errno == 127) if ($sys_errno == 127)
{ {
remove_file $MYSQL_TMP_DIR/mysql_in; remove_file $MYSQL_TMP_DIR/mysql_in;