diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-18 13:10:09 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-18 13:10:09 +0300 |
commit | 69628551858825bebc3f1653882920e4f6555cbb (patch) | |
tree | d744f4354c81c93ac76bf6530eefde17eb093177 /sql/table.cc | |
parent | 26b594e4110b4f7e6f2bcfbdb4c87aef65652bc0 (diff) | |
parent | 10ebdb7f1d7a3f6aa6a91b40a9d90f482da08e58 (diff) | |
download | mariadb-git-69628551858825bebc3f1653882920e4f6555cbb.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/table.cc')
-rw-r--r-- | sql/table.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/table.cc b/sql/table.cc index f5b5bad99cc..d3b4cf3a3c0 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -564,14 +564,14 @@ inline bool is_system_table_name(const char *name, uint length) SYNOPSIS open_table_def() - thd Thread handler + thd Thread handler share Fill this with table definition - db_flags Bit mask of the following flags: OPEN_VIEW + flags Bit mask of the following flags: OPEN_VIEW NOTES This function is called when the table definition is not cached in table definition cache - The data is returned in 'share', which is alloced by + The data is returned in 'share', which is allocated by alloc_table_share().. The code assumes that share is initialized. */ |