[Maria-developers] Rev 2726: Exclude innodb_plugin form MariaDB's max and max-no-ndb configurations and in file:///home/psergey/bzr-new/mysql-5.1-maria-contd3/
At file:///home/psergey/bzr-new/mysql-5.1-maria-contd3/ ------------------------------------------------------------ revno: 2726 revision-id: psergey@askmonty.org-20090910081123-1hg7mxrfguchn811 parent: psergey@askmonty.org-20090910080750-tcyaxkh0wwpgqzad committer: Sergey Petrunya <psergey@askmonty.org> branch nick: mysql-5.1-maria-contd3 timestamp: Thu 2009-09-10 12:11:23 +0400 message: Exclude innodb_plugin form MariaDB's max and max-no-ndb configurations and from the default build. We have xtradb instead. === modified file 'BUILD/SETUP.sh' --- a/BUILD/SETUP.sh 2009-05-11 15:31:30 +0000 +++ b/BUILD/SETUP.sh 2009-09-10 08:11:23 +0000 @@ -153,7 +153,7 @@ base_configs="$base_configs --with-extra-charsets=complex " base_configs="$base_configs --enable-thread-safe-client " base_configs="$base_configs --with-big-tables" -base_configs="$base_configs --with-plugin-maria --with-maria-tmp-tables" +base_configs="$base_configs --with-plugin-maria --with-maria-tmp-tables --without-plugin-innodb_plugin" if test -d "$path/../cmd-line-utils/readline" then === modified file 'storage/innodb_plugin/plug.in' --- a/storage/innodb_plugin/plug.in 2009-07-30 12:42:56 +0000 +++ b/storage/innodb_plugin/plug.in 2009-09-10 08:11:23 +0000 @@ -15,7 +15,7 @@ # MYSQL_STORAGE_ENGINE(innodb_plugin,, [InnoDB Storage Engine], - [Transactional Tables using InnoDB], [max,max-no-ndb]) + [Transactional Tables using InnoDB],) MYSQL_PLUGIN_DIRECTORY(innodb_plugin, [storage/innodb_plugin]) MYSQL_PLUGIN_DYNAMIC(innodb_plugin, [ha_innodb_plugin.la]) MYSQL_PLUGIN_ACTIONS(innodb_plugin, [
Hi Sergey, Attached patch fixes two more failures in the merge as seen in Buildbot. The main.innodb failures are two different issues. One I already fixed in another place in XtraDB, I added a comment to explain better. The other looks like a merge error, the result file was changed in the merge but the output of the test did not change. The main.bug46080 failure is really due to a poor test case. It checks that an out-of-memory condition does not crash the server, but it does so poorly using --safemalloc-mem-limit=4000000. This requires all kinds of assumptions about how much memory is actually used. MariaDB uses more memory (due to the Maria storage engine I assume). I increased the value to something reasonable for Maria that should still trigger the out-of-memory condition. The better fix would be to re-write the test case to use error injection. - Kristian.
Hm, seems I forgot to attach the patch. - Kristian. Kristian Nielsen <knielsen@knielsen-hq.org> writes:
Hi Sergey,
Attached patch fixes two more failures in the merge as seen in Buildbot.
The main.innodb failures are two different issues. One I already fixed in another place in XtraDB, I added a comment to explain better. The other looks like a merge error, the result file was changed in the merge but the output of the test did not change.
The main.bug46080 failure is really due to a poor test case. It checks that an out-of-memory condition does not crash the server, but it does so poorly using --safemalloc-mem-limit=4000000. This requires all kinds of assumptions about how much memory is actually used. MariaDB uses more memory (due to the Maria storage engine I assume). I increased the value to something reasonable for Maria that should still trigger the out-of-memory condition. The better fix would be to re-write the test case to use error injection.
participants (2)
-
Kristian Nielsen -
Sergey Petrunya