diff options
| author | unknown <guilhem@gbichot3.local> | 2006-09-21 23:12:56 +0200 |
|---|---|---|
| committer | unknown <guilhem@gbichot3.local> | 2006-09-21 23:12:56 +0200 |
| commit | 8e04cdb2dd1b5102e578c9c98b220a07857bfcbb (patch) | |
| tree | f1dd1c03bdd503138ebd1c80e8b12ce7ac3e4e69 /storage | |
| parent | b860539e37bb585794e144d5785906af13e0e1b9 (diff) | |
| download | mariadb-git-8e04cdb2dd1b5102e578c9c98b220a07857bfcbb.tar.gz | |
Maria: fixes for build failures in pushbuild. Comments, fixing of function names.
mysys/mf_pagecache.c:
comments fixing. More comments.
pagecache_ulock_block->page_unlock_block
sql/mysqld.cc:
MyISAM is always enabled so Maria needs have_maria
which MyISAM does not need. This should fix a link failure in pushbuild
storage/Makefile.am:
force myisam to be built before maria (will not be needed when
Maria does not depend on MyISAM anymore)
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/Makefile.am b/storage/Makefile.am index 900e486c6ac..e5d7ac2778f 100644 --- a/storage/Makefile.am +++ b/storage/Makefile.am @@ -20,7 +20,12 @@ AUTOMAKE_OPTIONS = foreign # These are built from source in the Docs directory EXTRA_DIST = -SUBDIRS = @mysql_se_dirs@ +# Until we remove fulltext-related references from Maria to MyISAM +# MyISAM must be built before Maria, which is not the case by default +# because of alphabetical order +# So we put myisam first; this is very ugly regarding plugins' logic +# but it works, and we'll remove it soon. +SUBDIRS = myisam @mysql_se_dirs@ # Don't update the files from bitkeeper %::SCCS/s.% |