diff options
author | Gleb Shchepa <gshchepa@mysql.com> | 2008-11-14 21:37:27 +0400 |
---|---|---|
committer | Gleb Shchepa <gshchepa@mysql.com> | 2008-11-14 21:37:27 +0400 |
commit | 8155de51e5acce2bf295bed0e7c8b9f829c2db71 (patch) | |
tree | ac048b0a414438fee2b88cc42f19e12e666f2ec0 /sql/sql_db.cc | |
parent | cba2743336055163874f6aec273f920ee0df5b11 (diff) | |
parent | 56b9586fd1d94ebd70662417a1d2ac1921da4ad2 (diff) | |
download | mariadb-git-8155de51e5acce2bf295bed0e7c8b9f829c2db71.tar.gz |
manual merge 5.0-bugteam --> 5.1-bugteam (bug 40021)
sql_view.cc: required_view_parameters has been decreased by 2
(not by 1) because its value was incorrect: 16 instead of 15
(minor performance issue).
sql/sql_view.cc:
sql_view.cc: required_view_parameters has been decreased by 2
(not by 1) because its value was incorrect: 16 instead of 15
(minor performance issue).
Diffstat (limited to 'sql/sql_db.cc')
-rw-r--r-- | sql/sql_db.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 0db88d7dd90..c538dfb08bc 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -1099,7 +1099,6 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db, /* .frm archive: Those archives are obsolete, but following code should exist to remove existent "arc" directories. - See #ifdef FRM_ARCHIVE directives for obsolete code. */ char newpath[FN_REFLEN]; MY_DIR *new_dirp; @@ -1268,7 +1267,6 @@ static my_bool rm_dir_w_symlink(const char *org_path, my_bool send_error) NOTE A support of "arc" directories is obsolete, however this function should exist to remove existent "arc" directories. - See #ifdef FRM_ARCHIVE directives for obsolete code. */ long mysql_rm_arc_files(THD *thd, MY_DIR *dirp, const char *org_path) { |