/[packages]/cauldron/mariadb/current/SPECS/mariadb.spec
ViewVC logotype

Diff of /cauldron/mariadb/current/SPECS/mariadb.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 395509 by alien, Fri Feb 8 13:03:17 2013 UTC revision 398167 by alien, Tue Feb 12 20:13:00 2013 UTC
# Line 76  Patch8:        mariadb-5.5-dubious-exports.pat Line 76  Patch8:        mariadb-5.5-dubious-exports.pat
76  # mandriva patches  # mandriva patches
77  Patch101:       mariadb-5.5-logrotate.patch  Patch101:       mariadb-5.5-logrotate.patch
78  Patch102:       mariadb-5.5-initscript.patch  Patch102:       mariadb-5.5-initscript.patch
 Patch103:       mariadb-5.5-mysql_upgrade-exit-status.patch  
79  Patch106:       mariadb-5.5-hotcopy.patch  Patch106:       mariadb-5.5-hotcopy.patch
80  Patch107:       mariadb-5.5-mysql_install_db-quiet.patch  Patch107:       mariadb-5.5-mysql_install_db-quiet.patch
81    
# Line 370  perl -pi -e "s|^basedir=.*|basedir=%{_pr Line 369  perl -pi -e "s|^basedir=.*|basedir=%{_pr
369    
370  # workaround for upstream bug #56342  # workaround for upstream bug #56342
371  rm -f mysql-test/t/ssl_8k_key-master.opt  rm -f mysql-test/t/ssl_8k_key-master.opt
372    rm -f mysql-test/t/file_contents.test
373    
374    # fix distribution name
375    sed -i 's/Source distribution/%{_vendor} MariaDB Server/' mysql-test/suite/percona/innodb_sys_index.result
376    
377  # upstream has fallen down badly on symbol versioning, do it ourselves  # upstream has fallen down badly on symbol versioning, do it ourselves
378  cp %{SOURCE4} libmysql/libmysql.version  cp %{SOURCE4} libmysql/libmysql.version
# Line 418  export FFLAGS="${FFLAGS:-%{optflags}}" Line 421  export FFLAGS="${FFLAGS:-%{optflags}}"
421      -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \      -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
422      -DWITHOUT_NDBCLUSTER_STORAGE_ENGINE=1 \      -DWITHOUT_NDBCLUSTER_STORAGE_ENGINE=1 \
423      -DWITHOUT_DAEMON_EXAMPLE=1 \      -DWITHOUT_DAEMON_EXAMPLE=1 \
424      -DWITH_PLUGIN_PBXT=1 \      -DWITH_PLUGIN_PBXT=0 \
425      -DFEATURE_SET="community" \      -DFEATURE_SET="community" \
426      -DCOMPILATION_COMMENT="%{_vendor} - MariaDB Community Edition (GPL)"      -DCOMPILATION_COMMENT="%{_vendor} MariaDB Server"
427    
428  cp ../libmysql/libmysql.version libmysql/libmysql.version  cp ../libmysql/libmysql.version libmysql/libmysql.version
429    
# Line 443  install -d %{buildroot}/var/lib/mysql/{m Line 446  install -d %{buildroot}/var/lib/mysql/{m
446    
447  %makeinstall_std -C build  %makeinstall_std -C build
448    
449    # exclude loaddata7 from being converted
450    export EXCLUDE_FROM_EOL_CONVERSION="std_data/loaddata7.dat"
451    
452  # install init scripts  # install init scripts
453  install -m0755 build/support-files/mysql.server %{buildroot}%{_initrddir}/mysqld  install -m0755 build/support-files/mysql.server %{buildroot}%{_initrddir}/mysqld
454    
# Line 580  EOF Line 586  EOF
586  # run the tests  # run the tests
587  %if %{build_test}  %if %{build_test}
588  # disable failing tests  # disable failing tests
 echo "rpl_trigger : Unstable test case" >> mysql-test/t/disabled.def  
 echo "type_enum : Unstable test case" >> mysql-test/t/disabled.def  
 echo "windows : For MS Windows only" >> mysql-test/t/disabled.def  
589  pushd build/mysql-test  pushd build/mysql-test
590  export LANG=C  export LANG=C
591  export LC_ALL=C  export LC_ALL=C
592  export LANGUAGE=C  export LANGUAGE=C
593      perl ./mysql-test-run.pl \      perl ./mysql-test-run.pl \
594      --mtr-build-thread="$((${RANDOM} % 100))" \      --mtr-build-thread="$((${RANDOM} % 100))" \
     --skip-ndb \  
     --timer \  
595      --retry=0 \      --retry=0 \
596      --ssl \      --ssl \
597      --mysqld=--binlog-format=mixed \      --big-test \
598        --force \
599        --max-test-fail=0 \
600      --testcase-timeout=60 \      --testcase-timeout=60 \
601      --suite-timeout=120 || false      --suite-timeout=1200 || false
602  popd  popd
603  %endif  %endif
604    
Legend:
Removed from v.395509  
changed lines
  Added in v.398167
  ViewVC Help
Powered by ViewVC 1.1.30