diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-07-13 07:21:21 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-07-13 07:21:21 +0400 |
| commit | 29acdcd5427e13bc3aefbbeee17b42bfe23dea84 (patch) | |
| tree | f8f5365594c3b43e01891b7017f47fa6b934c646 /client/mysql_upgrade.c | |
| parent | e33bda183e80ff63a984ed2a938467950b23a3fd (diff) | |
| parent | daec0004502a1f8c2ff7d46de92a61b5c4da1d6c (diff) | |
| download | mariadb-git-MDEV-9804.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3MDEV-9804
Conflicts:
VERSION
debian/mariadb-backup-10.2.files
debian/mariadb-backup-10.2.install
debian/mariadb-backup-10.3.files
mysql-test/unstable-tests
Diffstat (limited to 'client/mysql_upgrade.c')
| -rw-r--r-- | client/mysql_upgrade.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 4e4970bacab..c10dc20e7d7 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -1171,6 +1171,8 @@ int main(int argc, char **argv) { int fd= create_temp_file(cnf_file_path, opt_tmpdir[0] ? opt_tmpdir : NULL, "mysql_upgrade-", O_CREAT | O_WRONLY, MYF(MY_FAE)); + if (fd < 0) + die(NULL); my_write(fd, USTRING_WITH_LEN( "[client]\n"), MYF(MY_FAE)); my_write(fd, (uchar*)ds_args.str, ds_args.length, MYF(MY_FAE)); my_close(fd, MYF(0)); |