diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-03-10 12:48:43 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-03-10 12:48:43 +0200 |
| commit | 32ef7fd4a6448b310b806e159651cd7209a6df4c (patch) | |
| tree | 8651694def257832c6e225eead2eec4c5a7c9aeb /include | |
| parent | 1252f9427cacfe4edac9e9d344b84bdd86aa79e1 (diff) | |
| parent | 9a59fab2ba3059aaec17d622dcdbefcc8cdf0cbe (diff) | |
| download | mariadb-git-32ef7fd4a6448b310b806e159651cd7209a6df4c.tar.gz | |
Merge with 3.23 to get fixes for --user and BACKUP TABLE
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-delete.result:
Delete: mysql-test/r/delete.result
BitKeeper/deleted/.del-stamp-h.in~4a5d6676232516c5:
Auto merged
client/mysqlbinlog.cc:
Auto merged
include/my_sys.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/delete.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
mysys/my_copy.c:
Auto merged
sql/field.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/mysql-test-run.sh:
merge with 3.23.56
mysql-test/r/backup.result:
merge (needs to be updated)
mysql-test/r/join.result:
merge (needs to be updated)
mysql-test/r/type_datetime.result:
merge (needs to be updated)
mysql-test/t/backup.test:
merge with 3.23
scripts/mysqld_safe.sh:
Only use first --user option
sql/ha_myisam.cc:
Don't let BACKUP TABLE overwrite old files
sql/log_event.h:
merge
sql/mysql_priv.h:
merge
sql/mysqld.cc:
Use first --user option
sql/slave.cc:
use local version
sql/sql_repl.h:
use local version
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 9610033e2a9..c67a150f24f 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -73,6 +73,7 @@ extern int NEAR my_errno; /* Last error in mysys */ #define MY_FREE_ON_ERROR 128 /* my_realloc() ; Free old ptr on error */ #define MY_HOLD_ON_ERROR 256 /* my_realloc() ; Return old ptr on error */ #define MY_THREADSAFE 128 /* pread/pwrite: Don't allow interrupts */ +#define MY_DONT_OVERWRITE_FILE 1024 /* my_copy; Don't overwrite file */ #define MY_CHECK_ERROR 1 /* Params to my_end; Check open-close */ #define MY_GIVE_INFO 2 /* Give time info about process*/ |