diff options
| author | msvensson@pilot.blaudden <> | 2007-04-18 13:21:39 +0200 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-04-18 13:21:39 +0200 |
| commit | 20e622dcf3d287cb8934ab7ad1d9a0cc90f88a45 (patch) | |
| tree | 4317cddb056d39ce60584a2c016839216506b06b /Makefile.am | |
| parent | 1c5c12ac5e4147326ef516c50fb0320b4c9e85ef (diff) | |
| download | mariadb-git-20e622dcf3d287cb8934ab7ad1d9a0cc90f88a45.tar.gz | |
Bug#25452 mysql_upgrade access denied
- Improve mysql_upgrade and add comments describing it's logic
- Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade
was started from
- Don't look for mysql_fix_privilege_tables.sql randomly, compile
in the mysql_fix_privilege_tables.sql file and use that to upgrade
the system tables of MySQL
- Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL
- Fix bug#26639, bug#24248 and bug#25405
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 04d50ccfbaf..92b8428e40e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,9 +21,9 @@ AUTOMAKE_OPTIONS = foreign EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ README COPYING EXCEPTIONS-CLIENT CMakeLists.txt SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ - @readline_topdir@ sql-common \ + @readline_topdir@ sql-common scripts \ @thread_dirs@ pstack \ - @sql_union_dirs@ scripts @man_dirs@ tests \ + @sql_union_dirs@ @man_dirs@ tests \ netware @libmysqld_dirs@ \ @bench_dirs@ support-files @tools_dirs@ |