Skip to content

Commit 1bf11ed

Browse files
committed
MDEV-40340 mariadb-import --lock-tables crashes
don't change `argv` pointer, it's needed later for --lock-tables
1 parent c678844 commit 1bf11ed

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

client/mysqlimport.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,9 +1314,9 @@ int main(int argc, char **argv)
13141314
}
13151315
else
13161316
{
1317-
for (; *argv != NULL; argv++)
1317+
for (char **t=argv; *t != NULL; t++)
13181318
{
1319-
table_load_params p(*argv, "", current_db, 0);
1319+
table_load_params p(*t, "", current_db, 0);
13201320
files_to_load.push_back(p);
13211321
}
13221322
}

mysql-test/main/mysqldump.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3227,7 +3227,7 @@ drop table db2.t1;
32273227
--exec $MYSQL db1 < $MYSQLTEST_VARDIR/tmp/dump/db1/t1.sql
32283228
--exec $MYSQL db2 < $MYSQLTEST_VARDIR/tmp/dump/db2/t1.sql
32293229
--exec $MYSQL_IMPORT --silent db1 $MYSQLTEST_VARDIR/tmp/dump/db1/t1.txt
3230-
--exec $MYSQL_IMPORT --silent db2 $MYSQLTEST_VARDIR/tmp/dump/db2/t1.txt
3230+
--exec $MYSQL_IMPORT --lock-tables --silent db2 $MYSQLTEST_VARDIR/tmp/dump/db2/t1.txt
32313231
select * from db1.t1;
32323232
select * from db2.t1;
32333233
drop database db1;

0 commit comments

Comments
 (0)