Commit graph

1069 commits

Author SHA1 Message Date
Sergei Golubchik
005c7e5421 mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
Michael Widenius
0fa7729954 - Solaris fixes:
- Fixed that wait_timeout_func and wait_timeout tests works on solaris
  - We have to compile without NO_ALARM on Solaris as Solaris doesn't support timeouts on sockets with setsockopt(.. SO_RCVTIMEO).
  - Fixed that compile-solaris-amd64-debug works (before that we got a wrong ELF class: ELFCLASS64 on linkage)
- Fixed some compiler warnings
- Fixed some failing tests

BUILD/compile-solaris-amd64-debug:
  Fixed that compile-solaris-amd64-debug works (before that we got a wrong ELF class: ELFCLASS64 on linkage)
configure.cmake:
  We have to compile without NO_ALARM on Solaris as Solaris doesn't support timeouts on sockets with setsockopt(.. SO_RCVTIMEO)
mysql-test/suite/parts/t/partition_basic_innodb.test:
  Mark test as big test (as otherwise we get timeout on our opensolaris machine in buildbot)
mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test:
  Remove warning
2013-05-15 16:28:12 +03:00
Balasubramanian Kandasamy
cdd8d08ffc Updated copyright year information 2013-05-13 10:21:09 +02:00
Balasubramanian Kandasamy
28db043774 Adding fix for Bug#16798868 2013-05-13 09:46:44 +02:00
Sergei Golubchik
b381cf843c mysql-5.5.31 merge 2013-05-07 13:05:09 +02:00
Balasubramanian Kandasamy
8ac3d16e7a Updated spec file for Bug16488773 2013-05-06 15:19:37 +02:00
unknown
bb70b07d98 Merge from mysql-5.5.31-release 2013-04-18 12:52:59 +02:00
Murthy Narkedimilli
abd76285da Merging the changes for Bug 16633169 - MYSQL.INFO CONTAINS OUTDATED INFORMATION. 2013-04-16 12:17:18 +02:00
Murthy Narkedimilli
7c384a9333 Bug 16633169 - MYSQL.INFO CONTAINS OUTDATED INFORMATION. 2013-04-16 12:12:18 +02:00
Nirbhay Choubey
b350990a11 local merge. 2013-04-09 14:03:35 +05:30
Nirbhay Choubey
4ad004c2b4 Backporting patch for bug#15852074. 2013-04-09 14:00:05 +05:30
Balasubramanian Kandasamy
5a781ff2ad Reverted MySQL Release Engineering mail address 2013-03-25 13:50:21 +01:00
Balasubramanian Kandasamy
061f3d1b53 Added SuSE RPM Build fix 2013-03-21 14:59:57 +01:00
Murthy Narkedimilli
e55c30f943 Correcting the permissions of the executable files. 2013-03-20 17:50:15 +01:00
Murthy Narkedimilli
7c28426b8b Correcting the permissions of executable files. 2013-03-20 17:49:30 +01:00
Murthy Narkedimilli
8afe262ae5 Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 15:53:48 +01:00
Murthy Narkedimilli
fe85f54640 Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
Balasubramanian Kandasamy
0fd024f6ee Added fix for Bug#16445097 2013-03-06 17:05:32 +01:00
Balasubramanian Kandasamy
f3abc36db6 Added fix for Bug#16445097 2013-03-06 16:33:26 +01:00
Sergei Golubchik
3bfd88d1d6 MDEV-4068 rpm scriptlet chown command dangerous
add --mysqld option to my_print_defaults
change server-postin script to use that
2013-03-06 09:32:13 +01:00
Balasubramanian Kandasamy
673c68a925 Updated Code for Bug#16235828 and Bug#16298542 2013-03-05 16:34:14 +01:00
Balasubramanian Kandasamy
8ac9ee0801 Updated Code for Bug#16235828 2013-03-05 16:16:34 +01:00
unknown
429e589256 Updated mysql.spec.sh file for br16298542 2013-03-01 14:11:24 +01:00
Sergei Golubchik
8161c6772d merge with mysql-5.5.30 minus few incorrect or not applicable changesets 2013-02-28 18:42:49 +01:00
unknown
759519034e Updated release number in mysql.spec.sh file for br16298542 2013-02-28 14:49:54 +01:00
unknown
5c22652bab Updated mysql.spec.sh file for br16298542 2013-02-28 14:36:00 +01:00
Murthy Narkedimilli
053d7e775c Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
Balasubramanian Kandasamy
31c06437c9 Removed Conflicts: mysql-libs mysql-libs-advanced from spec file 2013-01-16 08:09:26 +01:00
Sergei Golubchik
d3935adf7a mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
Michael Widenius
edc89f7511 Buildbot fixes and cleanups:
- Added --verbose to BUILD scripts to get make to write out compile commands.
- Detect if AM_EXTRA_MAKEFLAGS=VERBOSE=1 was used with build scripts.
- Don't write warnings about replication variables when doing bootstrap.
- Fixed that mysql_cond_wait() and mysql_cond_timedwait() will report original source file in case of errors.
- Ignore some compiler warnings

BUILD/FINISH.sh:
  Detect if AM_EXTRA_MAKEFLAGS=VERBOSE=1 or --verbose was used
BUILD/SETUP.sh:
  Added --verbose to print out the full compile lines
  Updated help message
client/mysqltest.cc:
  Fixed that one can use 'replace' with cat_file
cmake/configure.pl:
  If --verbose is used, get make to write out compile commands
debian/dist/Debian/rules:
  Added $AM_EXTRA_MAKEFLAGS to get VERBOSE=1 on buildbot builds
debian/dist/Ubuntu/rules:
  Added $AM_EXTRA_MAKEFLAGS to get VERBOSE=1 on buildbot builds
include/my_pthread.h:
  Made set_timespec_time_nsec() more portable.
include/mysql/psi/mysql_thread.h:
  Fixed that mysql_cond_wait() and mysql_cond_timedwait() will report original source file in case of errors.
mysql-test/suite/innodb/r/auto_increment_dup.result:
  Fixed wrong DBUG_SYNC
mysql-test/suite/innodb/t/auto_increment_dup.test:
  Fixed wrong DBUG_SYNC
mysql-test/suite/perfschema/include/upgrade_check.inc:
  Make test more portable for changes in *.sql files
mysql-test/suite/perfschema/r/pfs_upgrade.result:
  Updated test results
mysql-test/valgrind.supp:
  Ignore running Aria checkpoint thread
scripts/mysqlaccess.sh:
  Changed reference of bugs database
  Ensure that also client-server group is read.
sql/handler.cc:
  Added missing syncpoint
sql/mysqld.cc:
  Don't write warnings about replication variables when doing bootstrap
sql/mysqld.h:
  Don't write warnings about replication variables when doing bootstrap
sql/rpl_rli.cc:
  Don't write warnings about replication variables when doing bootstrap
sql/sql_insert.cc:
  Don't mask SERVER_SHUTDOWN in insert_delayed
  This is done to be able to distingush between shutdown and interrupt errors
support-files/compiler_warnings.supp:
  Ignore some compiler warnings in xtradb,innobase, oqgraph, yassl, string3.h
2013-01-11 02:03:43 +02:00
Michael Widenius
35b6020835 Fixed some compiler warnings
client/mysqldump.c:
  Removed compiler warning
extra/yassl/taocrypt/include/pwdbased.hpp:
  Removed compiler warning (iterations is always unsigned)
support-files/compiler_warnings.supp:
  Ignore warnings from groff
2012-12-19 21:58:05 +02:00
Sergei Golubchik
ee9afef271 mysql-5.5.28 2012-10-16 13:04:42 +02:00
Sergei Golubchik
3012a5d5ce MDEV-3796 various RPM problems
cmake/cpack_rpm.cmake:
  * mark all cnf files with %config(noreplace)
  * add the forgotten postun script
sql/sys_vars.cc:
  0 for a string variable means "no default. But datadir has the default value.
support-files/rpm/server-postin.sh:
  * use mysqld --help to determine the correct datadir in the presence of my.cnf files
    (better than my_print_defaults, because it considers the correct group set).
  * Only create users, and chown/chmod if it's a fresh install, not an upgrade.
  * only run mysql_install_db if datadir does not exist
2012-10-05 14:24:38 +02:00
Joerg Bruehe
813b661d00 Spec file change to work around cast ulonglong -> int. 2012-09-11 12:47:32 +02:00
Michael Widenius
75e8ce6d73 Ensure we don't assert with debug binaries if SHOW INNODB STATUS returns with an error.
sql/handler.cc:
  SHOW INNODB STATUS sometimes returns 0 even if it has generated an error.
  This code is here to catch it until InnoDB some day is fixed.
storage/innobase/handler/ha_innodb.cc:
  Catch at least one of the possible errors from SHOW INNODB STATUS to provide a correct return code.
storage/xtradb/handler/ha_innodb.cc:
  Catch at least one of the possible errors from SHOW INNODB STATUS to provide a correct return code.
support-files/my-huge.cnf.sh:
  Fixed typo
2012-08-20 22:54:15 +03:00
unknown
ee27b50ff8 Fix incorrect regexp in warning suppression pattern 2012-08-17 14:35:28 +02:00
Michael Widenius
89036b9f8a Fixed compiler warnings
Fixed error in test that caused following tests to fail

extra/yassl/taocrypt/src/dsa.cpp:
  Fixed compiler warning by adding cast
mysql-test/suite/rpl/t/rpl_start_slave_deadlock_sys_vars.test:
  We have to first test for have_debug_sync to not start master wrongly
plugin/auth_pam/auth_pam.c:
  Fixed compiler warning
sql/sys_vars.h:
  Fixed compiler warning (Sys_var_max_user_conn is now signed)
support-files/compiler_warnings.supp:
  Don't give warnings for auth_pam.c (Tried to fix it by changing the code, but could not find an easy way to do that on solaris)
2012-08-17 10:01:19 +03:00
Sergei Golubchik
d11829654c merge with MySQL 5.5.27
manually checked every change, reverted incorrect or stupid changes.
2012-08-09 17:22:00 +02:00
Joerg Bruehe
11fc7b64d3 Spec file: Declare conflicts with the ULN RPMs. 2012-07-26 21:20:15 +02:00
Joerg Bruehe
aa36e25cb2 Spec file: transfer the 'runselftest' macro to a work tree. 2012-07-26 20:41:45 +02:00
Joerg Bruehe
d06273ef43 Spec file polishing: Handle 'MySQL-*' and 'mysql-*', part 1 2012-07-26 20:24:51 +02:00
Joerg Bruehe
dbfe6a6d42 Merge 5.5.27 into the tree for ULN RPMs. 2012-07-25 22:22:34 +02:00
Joerg Bruehe
d4caad52a5 Fix bug#14318456 SPEC FILE DOES NOT RUN THE TEST SUITE DURING RPM BUILD
Add a macro "runselftest" to the spec file for RPM builds.

If its value is 1 (the default), the test suite will be run during
the RPM build.
To prevent that, add this to the rpmbuild command line:
    --define "runselftest 0"
Failures of the test suite will NOT make the RPM build fail!


support-files/mysql.spec.sh:
  Add the "runselftest" macro following the model provided by RedHat.
  
  This code is similar to what we plan to use for ULN RPMs.
2012-07-24 12:32:14 +02:00
Sergei Golubchik
13982b5a11 comments 2012-06-15 10:26:06 +02:00
Joerg Bruehe
9ea789e434 Still work on getting the "SPECIFIC-ULN/" files into the build.
"INSTALL" was wrong, happens too late,
but "CONFIGURE_FILES(... COPYONLY)" should hopefully do it.

Traditional RPMs need to be checked, the above might fix their issues.
2012-06-12 11:01:41 +02:00
Joerg Bruehe
2c64e17361 Protect traditional RPMs that "SPECIFIC-ULN/" will not break their packaging. 2012-06-11 22:07:24 +02:00
Bjorn Munch
d74c3df6ce Backport SuSE 11 fix to RPM spec file 2012-06-08 16:31:03 +02:00
Sergei Golubchik
108265bd9e MDEV-295 Do NOT start mysql when installing MariaDB rpms
but restart it on upgrade, if it was already running
2012-05-25 21:08:26 +02:00
Sergei Golubchik
be0d1179a8 create a new MariaDB-common.rpm that contains files needed both by the client and the server.
use my.cnf includes to split one big my.cnf file in server and client parts.

remove "Provides: mysql-libs" (doesn't help on CentOS 6)
2012-05-25 19:18:29 +02:00
Sergei Golubchik
ec586f529c Building RPMs with CPack
configure with cmake -DRPM=distro
2012-05-22 11:04:32 +02:00