1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.5' into 10.1

Browse Source
This commit is contained in:
Oleksandr Byelkin 2019-05-02 17:23:36 +02:00
commit b85aa20065
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/t/bootstrap.test
View File

@ -65,6 +65,15 @@ SELECT 'bug' as '' FROM INFORMATION_SCHEMA.ENGINES WHERE engine='innodb'
--error 1 --error 1
--exec $MYSQLD_BOOTSTRAP_CMD --myisam_recover_options=NONE --exec $MYSQLD_BOOTSTRAP_CMD --myisam_recover_options=NONE
#
# MDEV-19349 mysql_install_db: segfault at tmp_file_prefix check
#
--write_file $MYSQLTEST_VARDIR/tmp/1
use test;
EOF
--exec $MYSQLD_BOOTSTRAP_CMD < $MYSQLTEST_VARDIR/tmp/1 >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
--remove_file $MYSQLTEST_VARDIR/tmp/1
--echo End of 5.5 tests --echo End of 5.5 tests
--source include/not_windows_embedded.inc --source include/not_windows_embedded.inc

3
sql/sql_base.cc
View File

@ -9216,8 +9216,7 @@ my_bool mysql_rm_tmp_tables(void)
{ {
file=dirp->dir_entry+idx; file=dirp->dir_entry+idx;
if (!memcmp(file->name, tmp_file_prefix, if (!strncmp(file->name, tmp_file_prefix, tmp_file_prefix_length))
tmp_file_prefix_length))
{ {
char *ext= fn_ext(file->name); char *ext= fn_ext(file->name);
uint ext_len= strlen(ext); uint ext_len= strlen(ext);