diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-09-24 11:16:36 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-09-24 11:18:39 +0400 |
| commit | 5f118b26c83960c8fa98bfd544f57ffd76b55304 (patch) | |
| tree | 762e9475ea3b0e402ebd0571a55958b377a3fab4 /storage/myisam/ha_myisam.cc | |
| parent | 896974fc3d721aabe1afbf637a566cab856a731d (diff) | |
| parent | 67b0faa29e59387b74ae8547c96cf0f31fc3d9d1 (diff) | |
| download | mariadb-git-5f118b26c83960c8fa98bfd544f57ffd76b55304.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 10.1
Diffstat (limited to 'storage/myisam/ha_myisam.cc')
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index bfa85abb7d9..886d898521c 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -741,8 +741,8 @@ int ha_myisam::open(const char *name, int mode, uint test_if_locked) growing files. Using an open_flag instead of calling mi_extra(... HA_EXTRA_MMAP ...) after mi_open() has the advantage that the mapping is not repeated for every open, but just done on the initial - open, when the MyISAM share is created. Everytime the server - requires to open a new instance of a table it calls this method. We + open, when the MyISAM share is created. Every time the server + requires opening a new instance of a table it calls this method. We will always supply HA_OPEN_MMAP for a permanent table. However, the MyISAM storage engine will ignore this flag if this is a secondary open of a table that is in use by other threads already (if the |