← Back to team overview

maria-developers team mailing list archive

Rev 82: Monty Program's fixes: attempts to produce a working deb in file:///home/psergey/work/monty_program/ourdelta-mariadb51-2/

 

At file:///home/psergey/work/monty_program/ourdelta-mariadb51-2/

------------------------------------------------------------
revno: 82
revision-id: psergey@xxxxxxxxxxxx-20091018090753-lex2hoijkci7axc5
parent: arjen@xxxxxxxxxxxxx-20091014112021-153diidibx9p52th
committer: Sergey Petrunya <psergey@xxxxxxxxxxxx>
branch nick: ourdelta-mariadb51-2
timestamp: Sun 2009-10-18 13:07:53 +0400
message:
  Monty Program's fixes: attempts to produce a working deb
=== modified file 'bakery/autobake-deb.sh'
--- a/bakery/autobake-deb.sh	2009-10-12 00:13:40 +0000
+++ b/bakery/autobake-deb.sh	2009-10-18 09:07:53 +0000
@@ -20,7 +20,7 @@
 BUILD_BASE_DIR="$(pwd)/build-temp-$$"
 DEB_POOL_BASE="/srv/shared/deb-pool"
 
-export DEB_BUILD_OPTIONS="fulltest"
+export DEB_BUILD_OPTIONS="nocheck"
 
 if [ ! $# -eq 1 ]; then
 	echo "Usage: $0 [tarball]"

=== modified file 'bakery/debian-5.0/additions/my.cnf'
--- a/bakery/debian-5.0/additions/my.cnf	2008-10-20 22:54:11 +0000
+++ b/bakery/debian-5.0/additions/my.cnf	2009-10-18 09:07:53 +0000
@@ -57,7 +57,7 @@
 #
 key_buffer		= 16M
 max_allowed_packet	= 16M
-thread_stack		= 128K
+thread_stack		= 256K
 thread_cache_size	= 8
 # This replaces the startup script and checks MyISAM tables if needed
 # the first time they are touched

=== modified file 'bakery/debian-5.1/additions/my.cnf'
--- a/bakery/debian-5.1/additions/my.cnf	2009-10-10 03:03:18 +0000
+++ b/bakery/debian-5.1/additions/my.cnf	2009-10-18 09:07:53 +0000
@@ -77,7 +77,7 @@
 connect_timeout		= 5
 wait_timeout		= 600
 max_allowed_packet	= 16M
-thread_stack		= 128K
+thread_stack		= 256K
 thread_cache_size       = 128
 sort_buffer_size	= 4M
 bulk_insert_buffer_size	= 16M

=== modified file 'bakery/debian-5.1/dist/Debian/mariadb-server-5.1.postinst'
--- a/bakery/debian-5.1/dist/Debian/mariadb-server-5.1.postinst	2009-10-01 01:15:59 +0000
+++ b/bakery/debian-5.1/dist/Debian/mariadb-server-5.1.postinst	2009-10-18 09:07:53 +0000
@@ -201,7 +201,8 @@
         "  Create_tmp_table_priv='Y', Lock_tables_priv='Y', Execute_priv='Y', "\
         "  Repl_slave_priv='Y', Repl_client_priv='Y', Create_view_priv='Y', "\
         "  Show_view_priv='Y', Create_routine_priv='Y', Alter_routine_priv='Y', "\
-        "  Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y' "`;
+        "  Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y' "\
+        "  ssl_cipher='', x509_issuer='', x509_subject='';"`;
     fix_privs=`/bin/echo -e \
         "USE mysql;\n" \
         "ALTER TABLE user ADD column Create_view_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \

=== modified file 'bakery/debian-5.1/dist/Ubuntu/mariadb-server-5.1.postinst'
--- a/bakery/debian-5.1/dist/Ubuntu/mariadb-server-5.1.postinst	2009-10-01 01:15:59 +0000
+++ b/bakery/debian-5.1/dist/Ubuntu/mariadb-server-5.1.postinst	2009-10-18 09:07:53 +0000
@@ -202,7 +202,8 @@
         "  Create_tmp_table_priv='Y', Lock_tables_priv='Y', Execute_priv='Y', "\
         "  Repl_slave_priv='Y', Repl_client_priv='Y', Create_view_priv='Y', "\
         "  Show_view_priv='Y', Create_routine_priv='Y', Alter_routine_priv='Y', "\
-        "  Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y' "`;
+        "  Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y',"\
+        "  ssl_cipher='', x509_issuer='', x509_subject='';"`;
     fix_privs=`/bin/echo -e \
         "USE mysql;\n" \
         "ALTER TABLE user ADD column Create_view_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \