mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
59874 commits 2784 branches 343 tags 1.6 GiB
Commit graph

59874 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vladislav Vaintroub
9c9cc49060 merge 2009-12-19 03:21:49 +01:00
Vladislav Vaintroub
54c5a4beef Simplify embedding version info into executables with ADD_VERSION_INFO 2009-12-18 23:53:30 +01:00
Vladislav Vaintroub
b9d05f2b68 add missing file to EXTRA_DIST 2009-12-18 01:32:01 +01:00
Vladislav Vaintroub
7363c50346 add new file 2009-12-18 00:43:35 +01:00
Vladislav Vaintroub
555d46ea7f 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
Marc Alff
92630be0ee Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marc 2009-12-17 02:12:02 -07:00
Marc Alff
67d945d270 Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marc 2009-12-16 15:48:55 -07:00
Vladislav Vaintroub
2ff2d1873a merge 2009-12-16 15:34:11 +01:00
Vladislav Vaintroub
f31b16543a fix windows errors with version resource 2009-12-16 13:25:41 +01:00
Mikael Ronstrom
fdd269ad94 Merge to latest mysql-next-mr 2009-12-16 09:49:16 +01:00
Alexander Nozdrin
b3d9906907 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
642f075569 Auto-merge from mysql-trunk. 2009-12-16 11:25:21 +03:00
Alexander Nozdrin
2ae8acc294 Remove .cvsignore files (attempt #2). 2009-12-16 11:24:30 +03:00
Vladislav Vaintroub
ffb0926373 attempt to fix error in rc call 2009-12-16 03:51:07 +01:00
Vladislav Vaintroub
833be37d95 Add version resource to windows executables 2009-12-16 02:51:13 +01:00
Mikael Ronstrom
4bd3686f96 Fix for Windows atomics 2009-12-16 00:33:15 +01:00
Mikael Ronstrom
432c5487e9 Fixed complex gcc assembler issues with 64-bit operations on 32-bit platforms using PIC codes, commented x86-gcc.h a lot more 2009-12-15 22:15:48 +01:00
Mikael Ronstrom
f5a547a971 Include windows.h in atomics framework for windows 2009-12-15 18:12:49 +01:00
Mikael Ronstrom
fe1287ea68 Fixed 64-bit atomics on Win x86 and removed support for 8 and 16-bit atomic operations 2009-12-15 17:07:43 +01:00
Mikael Ronstrom
f06d24c18e Fixed atomic instruction headers for Windows and x86-gcc 2009-12-15 15:40:08 +01:00
Alexander Nozdrin
efaa28abb4 Post-merge fix. 2009-12-15 10:31:49 +03:00
Alexander Nozdrin
83aa3cf4e3 Post-merge fix (binlog_unsafe). 2009-12-15 10:25:46 +03:00
Mikael Ronstrom
5a31a8f619 Merge 2009-12-14 17:08:30 +01:00
Mikael Ronstrom
10d4a9510d Fixed an issue where STOP SLAVE generated a warning to error log which test case couldn't handle, fixed by checking for io slave killed before checking for network error 2009-12-14 15:51:42 +01:00
Evgeny Potemkin
5466618420 Post-merge fix. 2009-12-14 17:17:41 +03:00
Vladislav Vaintroub
1f6bfeed4b 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
826ecdb852 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
535d1fa97e Mark signing parameters as advanced 2009-12-13 00:17:42 +01:00
Alexander Nozdrin
bc2d4e620a 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
a8e3b18bba new option SIGNCODE to sign executables and dlls with digital certificates 2009-12-12 20:30:18 +01:00
Vladislav Vaintroub
4a0af44a81 remove debug message 2009-12-12 02:10:47 +01:00
Vladislav Vaintroub
c5d7bcf376 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
91d9e6b670 merge 2009-12-11 21:17:17 +01:00
Marc Alff
eadf9532fd Merge cleanup 2009-12-11 12:45:44 -07:00
Vladislav Vaintroub
670fb75598 Introduce macro DTRACE_INSTRUMENT_STATIC_LIBS,to hide 
the ugly Solaris dtrace workarounds
 2009-12-11 18:33:00 +00:00
Vladislav Vaintroub
6454d6e2c6 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
69cfd5c8ec 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
Marc Alff
edd5ff174c Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc 2009-12-11 01:58:13 -07:00
Alexander Nozdrin
713ed2d243 Auto-merge (empty) from mysql-5.1. 2009-12-11 10:01:27 +03:00
Alexander Nozdrin
bd1f8f5bfa Auto-merge from mysql-trunk. 2009-12-11 09:20:49 +03:00
Alexander Nozdrin
2757eab544 Remove BitKeeper dir and .cvsignore. 2009-12-11 09:19:51 +03:00
Alexander Nozdrin
cfce3d0eb1 Auto-merge (empty) from mysql-next-mr. 2009-12-11 09:03:38 +03:00
Alexander Nozdrin
de06a06afa Auto-merge (empty) from mysql-trunk. 2009-12-11 08:56:28 +03:00
Alexander Nozdrin
bbea46f1f0 Auto-merge from mysql-next-mr-bugfixing. 2009-12-11 08:54:53 +03:00
Alexander Nozdrin
b8aace9485 Auto-merge from mysql-trunk-bugfixing. 2009-12-11 08:54:36 +03:00
Alexander Nozdrin
3a33af89d8 Auto-merge from mysql-next-mr-bugfixing. 2009-12-10 22:27:28 +03:00
Alexander Nozdrin
28bc3aa791 Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-10 17:48:40 +03:00
Alexander Nozdrin
fcbbac8b37 Auto-merge (empty) from mysql-trunk. 2009-12-10 17:45:22 +03:00
Alexander Nozdrin
324e1a9dbc Auto-merge from mysql-next-mr. 2009-12-10 17:44:36 +03:00
Vladislav Vaintroub
baf588a26f remove inadverent change 2009-12-10 15:01:39 +01:00