Commit graph

59835 commits

Author SHA1 Message Date
Vladislav Vaintroub
c7d19daba5 add missing file to EXTRA_DIST 2009-12-18 01:32:01 +01:00
Vladislav Vaintroub
e348453395 add new file 2009-12-18 00:43:35 +01:00
Vladislav Vaintroub
eb3c44030b Replace ADD_EXECUTABLE with MYSQL_ADD_EXECUTABLE for binaries that are installed.
MYSQL_ADD_EXECUTABLE  will instructs CPack where to install the exe. On Windows, it also 
adds version resource and   if -DSIGNCODE  was given, will sign the exe in packaging step.
2009-12-17 14:41:50 +01:00
Vladislav Vaintroub
07bfd2617d merge 2009-12-16 15:34:11 +01:00
Vladislav Vaintroub
04d1596d64 fix windows errors with version resource 2009-12-16 13:25:41 +01:00
Alexander Nozdrin
5cd3dffebb Update version in mysql-next-mr.
According to new numbering scheme mysql-next-mr does not have
its own version. Some version placeholder is used instead.

It's been agreed that 5.5.99 will be used as a placeholder.
2009-12-16 11:32:31 +03:00
Alexander Nozdrin
99890516ea Auto-merge from mysql-trunk. 2009-12-16 11:25:21 +03:00
Alexander Nozdrin
78c61d6b83 Remove .cvsignore files (attempt #2). 2009-12-16 11:24:30 +03:00
Vladislav Vaintroub
28a7bb8b8c attempt to fix error in rc call 2009-12-16 03:51:07 +01:00
Vladislav Vaintroub
37b1efb947 Add version resource to windows executables 2009-12-16 02:51:13 +01:00
Alexander Nozdrin
3040ef5cb4 Post-merge fix. 2009-12-15 10:31:49 +03:00
Alexander Nozdrin
2915b523cb Post-merge fix (binlog_unsafe). 2009-12-15 10:25:46 +03:00
Evgeny Potemkin
5606aed183 Post-merge fix. 2009-12-14 17:17:41 +03:00
Vladislav Vaintroub
9051d1c0df Fix add_suppresion in partition_recover_myisam.
error message would contain full path to ha_myisam.cc,
if MySQL is compiled with CMake but suppression assumed
only the filename without path.
2009-12-13 23:50:33 +00:00
Vladislav Vaintroub
ef65dae9b1 Dtrace on Solaris:
fix excessive relinking that results from rerunning
dtrace -G second time on the objects that come into 
static library. 
The reason for relinking is that dtrace -G changes 
timestamp for the object file, which in turn results
in re-archiving the mysys on next time make runs, 
which causes relinking of the whole mysql, because
everything depends on mysys.

The fix is to copy objects into temp before running 
dtrace -G in mysqld pre-build step. This way dtrace 
does not affect the object timestamp.
2009-12-13 05:42:26 +00:00
Vladislav Vaintroub
3c3dc0f524 Mark signing parameters as advanced 2009-12-13 00:17:42 +01:00
Alexander Nozdrin
aceea2342f Manual merge from mysql-trunk-merge.
Conflicts:
  - extra/comp_err.c
  - mysql-test/collections/default.experimental
  - mysql-test/r/archive.result
  - mysql-test/r/select.result
  - mysql-test/suite/binlog/r/binlog_unsafe.result
  - mysql-test/suite/binlog/t/binlog_unsafe.test
  - mysql-test/suite/rpl/t/disabled.def
  - mysql-test/t/archive.test
  - mysql-test/t/select.test
  - sql/item.cc
  - sql/item.h
  - sql/item_timefunc.cc
  - sql/sql_base.cc
  - sql/sql_delete.cc
  - sql/sql_load.cc
  - sql/sql_partition.cc
  - sql/sql_table.cc
  - storage/innobase/handler/ha_innodb.cc
  - vio/vio.c
2009-12-12 23:38:59 +03:00
Vladislav Vaintroub
770d315846 new option SIGNCODE to sign executables and dlls with digital certificates 2009-12-12 20:30:18 +01:00
Vladislav Vaintroub
df3b67318c remove debug message 2009-12-12 02:10:47 +01:00
Vladislav Vaintroub
cedb6101db Cleanup, use MYSQL_INSTALL_TARGETS macro instead of INSTALL(TARGETS) combined with
INSTALL_DEBUG_SYMBOLS
2009-12-12 02:03:05 +01:00
Vladislav Vaintroub
a6f6932e26 merge 2009-12-11 21:17:17 +01:00
Vladislav Vaintroub
3a6b75949c Introduce macro DTRACE_INSTRUMENT_STATIC_LIBS,to hide
the ugly Solaris dtrace workarounds
2009-12-11 18:33:00 +00:00
Vladislav Vaintroub
55ccb35ba6 Introduce a workaround for Solaris' inability to deal with dtrace in static libraries.
Rerun dtrace -G on all  objects that can contan dtrace probes (also objects that are
part of static libs) before linking mysqld to produce dtrace_probes_all.o and link 
dtrace_probes_all.o with mysqld

This ugly workaround was inspired by handling dtrace using autotools.
2009-12-11 15:51:39 +01:00
Alexander Nozdrin
5676713687 Manual merge from mysql-trunk.
Conflicts:
  - client/mysqltest.cc
  - mysql-test/collections/default.experimental
  - mysql-test/suite/rpl/t/disabled.def
  - sql/mysqld.cc
  - sql/opt_range.cc
  - sql/sp.cc
  - sql/sql_acl.cc
  - sql/sql_partition.cc
  - sql/sql_table.cc
2009-12-11 12:39:38 +03:00
Alexander Nozdrin
efee060831 Auto-merge (empty) from mysql-5.1. 2009-12-11 10:01:27 +03:00
Alexander Nozdrin
376cf4275f Auto-merge from mysql-trunk. 2009-12-11 09:20:49 +03:00
Alexander Nozdrin
ceefe7bb50 Remove BitKeeper dir and .cvsignore. 2009-12-11 09:19:51 +03:00
Alexander Nozdrin
160322439a Auto-merge (empty) from mysql-next-mr. 2009-12-11 09:03:38 +03:00
Alexander Nozdrin
f14483b0d4 Auto-merge (empty) from mysql-trunk. 2009-12-11 08:56:28 +03:00
Alexander Nozdrin
763b0810f1 Auto-merge from mysql-next-mr-bugfixing. 2009-12-11 08:54:53 +03:00
Alexander Nozdrin
eae0cd2a40 Auto-merge from mysql-trunk-bugfixing. 2009-12-11 08:54:36 +03:00
Alexander Nozdrin
c323c2d8bf Auto-merge from mysql-next-mr-bugfixing. 2009-12-10 22:27:28 +03:00
Alexander Nozdrin
26e2802cf0 Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-10 17:48:40 +03:00
Alexander Nozdrin
88c4f57ec9 Auto-merge (empty) from mysql-trunk. 2009-12-10 17:45:22 +03:00
Alexander Nozdrin
97928f59b8 Auto-merge from mysql-next-mr. 2009-12-10 17:44:36 +03:00
Vladislav Vaintroub
1ec457961d remove inadverent change 2009-12-10 15:01:39 +01:00
Vladislav Vaintroub
6811d7554f merge 2009-12-10 11:47:31 +01:00
Sergey Vojtovich
9b0e649a2c After merge fix: pthread_mutext_[un]lock -> mysql_mutex_[un]lock. 2009-12-10 13:19:06 +04:00
Vladislav Vaintroub
7c3ca3e682 Check for clock_gettime in librt 2009-12-10 04:09:32 +01:00
Vladislav Vaintroub
ef4685eccf fix install_symlink on unixes other than osx 2009-12-10 03:48:21 +01:00
Vladislav Vaintroub
82b07c4d8a Remove -Wl,--as-needed option, broken on Fedora 2009-12-09 16:34:52 +01:00
Sergey Vojtovich
cda5ad508a Merge mysql-next-mr to mysql-next-mr-svoj. 2009-12-09 15:03:34 +04:00
Sergey Vojtovich
6b8cd32eaa An addition to backport of
WL#3951 - MyISAM: Additional Error Logs for Data Corruption
Fixed partition_repair_myisam.test.

mysql-test/suite/parts/t/partition_repair_myisam.test:
  Suppress some extra warnings produced by MyISAM.
2009-12-09 11:33:28 +04:00
vvaintroub
0e28e588b9 Use CMAKE_CFG_INTDIR instead of different MSVC and Xcode specific
configuration names
2009-12-09 03:13:38 +01:00
Magne Mahre
0eb255ee8d Bug#35589 SET PASSWORD caused a crash
Bug#35591 FLUSH PRIVILEGES caused a crash

A race condition on the privilege hash tables (proc_priv_hash
and func_priv_hash) caused one thread to try to delete elements
that had already been deleted by another thread.

The bug was caused by reading and saving the pointers to 
the hash tables outside mutex protection.  This led to an
inconsistency where a thread copied a pointer to a hash,
another thread did the same, the first thread then deleted
the hash, and the second then crashed when it in turn tried to
delete the deleted hash.

The fix is to ensure that operations on the shared hash structures
happens under mutex protection (moving the locking up a little)
2009-12-08 13:19:38 +01:00
V Narayanan
acacdb9e07 merging with mysql-next-mr-svoj 2009-12-08 17:22:59 +05:30
unknown
8dc0091c21 Null-merge from mysql-5.1.40sp1-release 2009-12-08 10:26:11 +01:00
V Narayanan
dc43549fb3 merging with mysql-next-mr-svoj 2009-12-08 12:38:50 +05:30
Alexander Nozdrin
6fd3866c6c Auto-merge from mysql-next-mr. 2009-12-08 09:55:52 +03:00
Vladislav Vaintroub
ef482374e5 couple of tweaks for solaris on sparc, link with librt, as it defines sched_yield 2009-12-08 03:12:23 +01:00