1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-30 11:22:14 +03:00
Commit Graph

72 Commits

Author SHA1 Message Date
Kent Boortz
94cde4c951 Merge 2010-12-29 01:26:31 +01:00
Kent Boortz
920d185fd8 Merge 2010-12-29 00:47:05 +01:00
Kent Boortz
fddb1f1b13 - Added/updated copyright headers
- Removed files specific to compiling on OS/2
- Removed files specific to SCO Unix packaging
- Removed "libmysqld/copyright", text is included in documentation
- Removed LaTeX headers for NDB Doxygen documentation
- Removed obsolete NDB files
- Removed "mkisofs" binaries
- Removed the "cvs2cl.pl" script
- Changed a few GPL texts to use "program" instead of "library"
2010-12-28 19:57:23 +01:00
Alexander Nozdrin
d7a4672cf7 Merge from mysql-5.0-bugteam. 2010-11-24 13:07:37 +03:00
Alexander Nozdrin
174a6962da A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remove all
EXCEPTIONS-CLIENT from all the places.
2010-11-24 12:53:39 +03:00
Alexander Nozdrin
7a3636c1af Merge from mysql-5.1-bugteam. 2010-11-24 13:23:44 +03:00
Alexander Nozdrin
f919f9e327 Cherry-picking patch for Bug#55846.
Original changeset:
------------------------------------------------------------
revno: 3186
revision-id: davi.arnaut@oracle.com-20100831142822-2qhufn3hho4xqr4p
parent: gshchepa@mysql.com-20100830222201-ie7n43mjy4irlllk
committer: Davi Arnaut <davi.arnaut@oracle.com>
branch nick: mysql-5.5-merge
timestamp: Tue 2010-08-31 11:28:22 -0300
message:
  Bug#55846: Link tests fail on Windows - my_compiler.h missing
  
  Make the my_compiler.h header, like my_attribute.h, part of
  the distribution. This is required due to the dependency of
  the former on the latter (which can undefine __attribute__).
------------------------------------------------------------
2010-08-31 18:33:19 +04:00
Davi Arnaut
a73b734949 Bug#55846: Link tests fail on Windows - my_compiler.h missing
Make the my_compiler.h header, like my_attribute.h, part of
the distribution. This is required due to the dependency of
the former on the latter (which can undefine __attribute__).
2010-08-24 10:48:45 -03:00
Davi Arnaut
fb91a92330 WL#5498: Remove dead and unused source code
Remove Windows related files which aren't used anymore.
2010-07-23 17:14:04 -03:00
Daniel Fischer
29f098f2d3 Make the libraries we produce on Windows actually usable 2010-04-16 10:27:18 +02:00
Joerg Bruehe
82b4452bd5 Some fixes for the build on Windows
as found necessary during the release build of 5.5.3-m3.
2010-03-22 16:02:31 +01:00
Joerg Bruehe
cb2c2fd8df Automerge the build fixes of 5.5.0-m2 back into the tree. 2009-12-16 14:11:20 +01:00
MySQL Build Team
be59f7ff54 Handle the "semisync" plugin in
- binary distributions for Windows,
- "generic" RPM packages.
2009-11-26 19:55:33 +01:00
Alexey Kopytov
f16b372b37 Manual merge from the mysql-5.1-bugteam. 2009-11-24 11:31:36 +03:00
Kent Boortz
33025abaf5 Merge 2009-11-17 17:53:45 +01:00
Kent Boortz
7f0a3d092e Include the "mysql-test/collections" directory when creating windows ZIP archive 2009-11-17 17:49:24 +01:00
Alexander Nozdrin
0f51423532 Merge from mysql-5.1. 2009-10-13 13:42:38 +04:00
Jonathan Perkin
e1f4344e68 bug#41546: mysql-stress-run.pl is not packaged on Windows
Copy mysql-stress-run.pl into noinstall package.
2009-09-30 14:46:47 +01:00
Alexander Nozdrin
22ceefcb58 Merge from mysql-5.1. 2009-09-23 11:16:11 +04:00
Alexander Nozdrin
eeec93f305 Merge from mysql-5.1. 2009-09-19 13:07:51 +04:00
Jonathan Perkin
c90e971d16 Install mysqld.lib 2009-09-04 17:45:07 +02:00
Jonathan Perkin
0af1cf8ef9 Only install the innodb plugin if the plugin directory exists. 2009-09-01 08:40:13 +02:00
Jonathan Perkin
1213dd1e2a Install innodb_plugin on Windows. 2009-08-18 16:23:15 +02:00
Mikael Ronstrom
506c7fd47d Merge MySQL 5.1.35 into MySQL 5.4 2009-06-11 12:07:59 +02:00
Joerg Bruehe
173811aee6 Upmerge the fix of an error message typo
(in "scripts/make_win_bin_dist")
from 5.0 into 5.1
2009-04-14 21:53:00 +02:00
Joerg Bruehe
452eeec084 Just fix a silly typo in an error message ... 2009-04-14 21:46:56 +02:00
Mikael Ronstrom
ba359419b7 Remove instance manager also from Windows distribution builds 2008-12-20 17:34:32 +01:00
joerg@trift2.
30f3d4ab46 Merge trift2.:/MySQL/M50/clone-5.0
into  trift2.:/MySQL/M50/push-5.0
2008-03-14 15:09:10 +01:00
kent@kent-amd64.(none)
006adbd412 Merge mysql.com:/home/kent/bk/build/mysql-5.0-build
into  mysql.com:/home/kent/bk/build/mysql-5.1-build
2008-03-11 15:28:45 +01:00
kent@mysql.com/kent-amd64.(none)
878b333680 make_win_bin_dist:
Include .pdb files for tools and libraries (bug#35104)
2008-03-11 15:21:58 +01:00
joerg@trift2.
00160fe9e9 Include "mysql_upgrade_shell.pl" in a binary distribution on Windows. 2008-03-05 14:03:05 +01:00
kent@mysql.com/kent-amd64.(none)
ae9a5a2fea Makefile.am, CMakeLists.txt, make_win_bin_dist:
Removed references to deleted "mysql_explain_log" and "mysql_tableinfo"
2008-01-31 20:55:58 +01:00
df@pippilotta.erinye.com
5c028eb402 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2008-01-02 22:26:41 +01:00
kent@mysql.com/kent-amd64.(none)
e45e7d9e2e Makefile.am, CMakeLists.txt, mysql_secure_installation.pl.in:
Added Perl version of script "mysql_secure_installation"
make_win_bin_dist:
  Corrected copy of SQL files to "share" directory
2007-12-28 22:58:54 +01:00
kent@kent-amd64.(none)
05c7156a35 Merge mysql.com:/home/kent/bk/windows-cleanup/mysql-5.0-build
into  mysql.com:/home/kent/bk/windows-cleanup/mysql-5.1-build
2007-12-28 01:07:42 +01:00
kent@mysql.com/kent-amd64.(none)
18418ff8c5 make_win_bin_dist CMakeLists.txt resolveip.c Makefile.am:
Better Windows support in the scripts directory
mysql_config.pl.in, mysql_install_db.pl.in:
  New Perl version of Unix shell script, mainly for Windows
Many files in scripts directory:
  Use default Perl location "#!/usr/bin/perl" instead of the build host path
2007-12-28 01:02:28 +01:00
kaa@polly.(none)
8c9efe2571 Merge polly.(none):/home/kaa/src/opt/bug32221/my50-bug31445
into  polly.(none):/home/kaa/src/opt/bug32221/my51-bug31445
2007-11-22 17:17:32 +03:00
kaa@polly.(none)
127f8e968e Fixed build failures on Windows introduced by the patch for bug #32221.
We do not have any executables in libmysql/release/ anymore.
2007-11-22 17:13:12 +03:00
kent@kent-amd64.(none)
add9cb76b5 Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
2007-08-06 08:33:20 +02:00
kent@mysql.com/kent-amd64.(none)
d75c7a58c1 make_win_bin_dist:
Corrected install path
2007-08-06 08:31:09 +02:00
kent@mysql.com/kent-amd64.(none)
f9fdd5ae8c make_win_bin_dist:
Copy embedded .pdb and static debug lib
2007-08-06 08:28:16 +02:00
kent@kent-amd64.(none)
dc998d9388 Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build
2007-08-02 20:59:23 +02:00
kent@mysql.com/kent-amd64.(none)
838a98c1e6 make_win_bin_dist:
Simplified copying of 'mysql-test' directory
2007-08-02 20:51:04 +02:00
kent@kent-amd64.(none)
423fd0b07e Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build
2007-08-02 12:56:54 +02:00
kent@mysql.com/kent-amd64.(none)
74267ad9b8 CMakeLists.txt (several), make_win_bin_dist:
Aligned client library build and use with the Unix version when it
  comes to what source to include directly in the builds, and what
  libraries to link with (bug#30118).

  Also reviewed, corrected and made more clear when static or dynamic
  Thread Local Storage is to be used. Some code duplication was removed,
  and some redundant library usage were removed, reducing the risk of
  incorrect TLS usage.
2007-08-02 12:49:27 +02:00
msvensson@pilot.(none)
ef80d45d0d Update make_win_bin_dist to also copy mysql-test/suite directory 2007-06-29 14:43:54 +02:00
df@pippilotta.erinye.com
6db1887a5c fix make_win_bin_dist typo 2007-06-13 19:19:11 +02:00
kent@mysql.com/kent-amd64.(none)
affeddbd8f make_win_bin_dist:
Aligned headers to include with Unix 'make install'
2007-06-12 19:49:02 +02:00
joerg@trift2.
d84c807204 After-merge fix in "scripts/make_win_bin_dist":
Ensure the balanced use of 'x' guards in string comparisons also in the new 5.1 lines.
2007-05-16 21:00:35 +02:00
joerg@trift2.
b3f35b8be5 Manual merge. 2007-05-16 20:52:50 +02:00