diff options
| author | unknown <sanja@montyprogram.com> | 2014-01-26 16:41:15 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2014-01-26 16:41:15 +0200 |
| commit | 31249744fe88bccee1054398baa532f44a6c2a10 (patch) | |
| tree | d32034bd289b9cc6df07238eb214204f28db02bc /storage/maria | |
| parent | c6de45584a40052754ccfa7fc27f59483af51e98 (diff) | |
| parent | d9cb1352c8256d9c19a3d29af6fe3d705578a413 (diff) | |
| download | mariadb-git-31249744fe88bccee1054398baa532f44a6c2a10.tar.gz | |
merge 5.3->5.5
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/ha_maria.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index 53076e7be45..94057f57de5 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -1,5 +1,6 @@ /* Copyright (C) 2004-2008 MySQL AB & MySQL Finland AB & TCX DataKonsult AB Copyright (C) 2008-2009 Sun Microsystems, Inc. + Copyright (c) 2009, 2014, SkySQL Ab. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1580,7 +1581,7 @@ int ha_maria::repair(THD *thd, HA_CHECK *param, bool do_optimize) param->db_name= table->s->db.str; param->table_name= table->alias.c_ptr(); - param->tmpfile_createflag= O_RDWR | O_TRUNC; + param->tmpfile_createflag= O_RDWR | O_TRUNC | O_EXCL; param->using_global_keycache= 1; param->thd= thd; param->tmpdir= &mysql_tmpdir_list; |