diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-09-01 00:54:54 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-09-01 00:54:54 +0300 |
| commit | 1999be8d4e9d721243c51b04c76ba11ad1e9fa56 (patch) | |
| tree | cd287f49c709f844d10d774643feb5843acf99a6 /support-files | |
| parent | 5a86a61219826aadf8d08cbc447fe438f2bf50c3 (diff) | |
| parent | b45c551ee32d0d5260f4958abf93efab1a4614a2 (diff) | |
| download | mariadb-git-1999be8d4e9d721243c51b04c76ba11ad1e9fa56.tar.gz | |
Automatic merge with 5.5
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/compiler_warnings.supp | 1 | ||||
| -rw-r--r-- | support-files/my-huge.cnf.sh | 2 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index 4d8478828c2..e18c44bf5ed 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -171,6 +171,7 @@ vio/viosslfactories\.c: discards ~const~ qualifier from pointer target type # .*/my_config\.h : _FILE_OFFSET_BITS /usr/include/sys/feature_tests.h : this is the location of the previous definition +.*auth_pam\.c : initialization from incompatible pointer type : 100-200 # # Unexplanable (?) stuff diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh index 896b139273b..4e083488285 100644 --- a/support-files/my-huge.cnf.sh +++ b/support-files/my-huge.cnf.sh @@ -121,7 +121,7 @@ server-id = 1 # Uncomment the following if you are using InnoDB tables #innodb_data_home_dir = @localstatedir@ #innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend -o#innodb_log_group_home_dir = @localstatedir@ +#innodb_log_group_home_dir = @localstatedir@ # You can set .._buffer_pool_size up to 50 - 80 % # of RAM but beware of setting memory usage too high #innodb_buffer_pool_size = 384M diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index a3d8554188e..5b9a296d90a 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -176,7 +176,7 @@ %endif %else %if %(test -f /etc/SuSE-release && echo 1 || echo 0) - %define susever %(rpm -qf --qf '%%{version}\\n' /etc/SuSE-release) + %define susever %(rpm -qf --qf '%%{version}\\n' /etc/SuSE-release | cut -d. -f1) %if "%susever" == "10" %define distro_description SUSE Linux Enterprise Server 10 %define distro_releasetag sles10 |