diff options
| author | monty@mysql.com <> | 2004-06-02 00:09:14 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-06-02 00:09:14 +0300 |
| commit | 70c2256d2f186640d328ea3655936db74184a0b1 (patch) | |
| tree | 7c47751643d7b2719fbee614235acaf2653f1d2a /innobase/include | |
| parent | 53d05f4adbf21f70fde5d552321033792479c6f1 (diff) | |
| parent | 3b313f14f2986cc6069ab55ad9123afe73ba821e (diff) | |
| download | mariadb-git-70c2256d2f186640d328ea3655936db74184a0b1.tar.gz | |
Merge with 4.0 to get fixes for netware
Diffstat (limited to 'innobase/include')
| -rw-r--r-- | innobase/include/os0file.h | 7 | ||||
| -rw-r--r-- | innobase/include/row0mysql.h | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/innobase/include/os0file.h b/innobase/include/os0file.h index 930390241d3..6549a3748df 100644 --- a/innobase/include/os0file.h +++ b/innobase/include/os0file.h @@ -169,6 +169,13 @@ void os_io_init_simple(void); /*===================*/ /*************************************************************************** +Creates a temporary file. In case of error, causes abnormal termination. */ + +FILE* +os_file_create_tmpfile(void); +/*========================*/ + /* out: temporary file handle (never NULL) */ +/*************************************************************************** The os_file_opendir() function opens a directory stream corresponding to the directory named by the dirname argument. The directory stream is positioned at the first entry. In both Unix and Windows we automatically skip the '.' diff --git a/innobase/include/row0mysql.h b/innobase/include/row0mysql.h index af6d8969cfc..390e8c4da57 100644 --- a/innobase/include/row0mysql.h +++ b/innobase/include/row0mysql.h @@ -558,6 +558,9 @@ struct row_prebuilt_struct { dtuple_t* clust_ref; /* prebuilt dtuple used in sel/upd/del */ ulint select_lock_type;/* LOCK_NONE, LOCK_S, or LOCK_X */ + ulint stored_select_lock_type;/* inside LOCK TABLES, either + LOCK_S or LOCK_X depending on the lock + type */ ulint mysql_row_len; /* length in bytes of a row in the MySQL format */ ulint n_rows_fetched; /* number of rows fetched after |