mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
60024 commits 2784 branches 343 tags 1.6 GiB
Commit graph

45 commits

Author SHA1 Message Date
Alexey Kopytov
82ba3e1dbc Manual merge from mysql-5.1-bugteam into mysql-trunk-merge. 
Conflicts:

Text conflict in .bzr-mysql/default.conf
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result
Text conflict in mysql-test/t/mysqlbinlog.test
Text conflict in sql/sql_acl.cc
Text conflict in sql/sql_servers.cc
Text conflict in sql/sql_update.cc
Text conflict in support-files/mysql.spec.sh
 2010-01-15 14:26:53 +03:00
Joerg Bruehe
684405a5d3 Implement the change of RPM versioning and file naming: 
- "release" starts from 1
- "level" ("m2", "rc", ...) is included in the RPM version.
 2010-01-11 19:23:36 +01:00
Mikael Ronstrom
506c7fd47d Merge MySQL 5.1.35 into MySQL 5.4 2009-06-11 12:07:59 +02:00
MC Brown
7ba75d5cd2 Adding DTrace test scripts to distribution targets 2009-04-16 18:06:32 +01:00
kent.boortz@sun.com
4f11a82b5c Insert current year as last copyright year for the product 
Don't use both "License" and "license" as RPM macro, they are the same
 2009-02-24 17:54:03 +01:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
c8d4323975 Makefile.am: 
Needed to add the new sample configuration files to the CLEANFILES section
 2008-01-24 19:04:48 +01:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
9803176bd1 config.medium.ini.sh, config.small.ini.sh, config.huge.ini.sh: 
Sample cluster configuration files for 5.1
Makefile.am:
  Updated for new files
 2008-01-23 20:45:46 +01:00
kent@mysql.com/kent-amd64.(none)
18acdc7581 make_binary_distribution.sh: 
Use 'make install' to create the package
Makefile.am:
  Added 'pkgsuppdir' to control location separately
  Pass on mandir and infodir
  Don't install headers
 2007-09-26 20:19:33 +02:00
joerg@trift2.
59588dff9a Merge trift2.:/MySQL/M50/bug21023-25486-5.0 
into  trift2.:/MySQL/M51/bug21023-25486-5.1
 2007-07-17 21:11:22 +02:00
joerg@trift2.
9d55f51b15 Handle "support-files/mysqld_multi.server.sh" like other shell scripts. 
Fixing bug#25486:  mysqld_multi.server.sh missing from builds
 2007-07-17 19:27:31 +02:00
serg@janus.mylan
e9fb4a686f dbug/dbug.c: unused variable removed 
include/config-win.h: SIZEOF_INT
include/my_global.h: win64 fix
support-files/Makefile.am: automake magic
 2007-03-17 11:19:21 +01:00
serg@janus.mylan
30321673a2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-02-26 16:12:40 +01:00
knielsen@ymer.(none)
01ea1aa44d Compiler warning suppression fix: Add missing file to 'make dist'. 2007-02-26 08:11:10 +01:00
serg@janus.mylan
689eed7406 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-02-21 11:36:23 +01:00
serg@janus.mylan
3dafdf7de2 /usr/share/aclocal/mysql.m4 2007-02-14 12:42:11 +01:00
joerg@trift2.
32e83a6c3d For Linux systems running RHEL 4 (which includes SE-Linux), we need to provide 
additional files that specify some actions which are allowed to the MySQL binaries.
    
Create a new subdirectory "supportfiles/RHEL4-SElinux" for them, and process it.

This fixes bug#12676.
 2007-01-25 17:51:21 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729 my_strtoll10-x86.s: 
Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf
 2006-12-31 01:02:27 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f Many files: 
Changed header to GPL version 2 only
 2006-12-23 20:17:15 +01:00
kent@mysql.com
095efe48a5 Makefile.am, configure.in: 
Enable "make distcheck" to work
 2005-09-24 15:51:45 +02:00
lenz@mysql.com
8a72ee556d Merge mysql.com:/space/my/mysql-4.0-merge 
into mysql.com:/space/my/mysql-4.1-merge
 2005-08-12 08:13:02 +02:00
lenz@mysql.com
776bf91371 - Make sure the Mac OS X support files are built, but not installed by "make install" (the previous 
change was too drastic) (BUG#12506)
 2005-08-11 20:13:12 +02:00
lenz@mysql.com
64e4c5ff98 - Manually merged fixes for BUG#12057 (*.plist (Mac OS X) files are installed on Linux) 2005-07-20 21:47:10 +02:00
lenz@mysql.com
ca9087a82c - don't install the Mac OS X support files when running "make install" - 
they're not needed outside of the source tree (BUG#12057)
- Removed some more unneeded files from "make install" along the way
 2005-07-20 19:15:48 +02:00
joerg@mysql.com
48ba5e4956 Step 1 of the switch to support configuration with NPTL: 
Rename 'IS_LINUX' configuration variable to 'TARGET_LINUX'.
 2005-04-20 20:10:28 +02:00
tulin@mysql.com
e70445d318 made an .sh file of ndb-config-2-node.ini instead 2005-02-03 17:58:02 +01:00
lenz@mysql.com
0f023b3b9b - fixed typo so make dist does not fail 2004-08-28 09:31:15 +02:00
lenz@mysql.com
e876d6f4da - typo fix - make sure to include an existing file in the source 
distribution...
 2004-08-26 19:46:11 +02:00
serg@serg.mylan
8f2d92c56a manually merged 2004-08-24 17:24:23 +02:00
lenz@mysql.com
89fcb8ee41 - make sure to recreate all autoconf/automake-related files after 
modifying configure.in for the commercial tarballs
 - added my-innodb-heavy-4G.cnf to the distribution
 2004-08-24 13:51:28 +02:00
lenz@kallisto.local
c104b25693 - added mysql-@VERSION@.spec to pkgdata_DATA again 
(it got lost during a recent BK merge)
 2004-03-09 19:23:29 +01:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
lenz@mysql.com
23cb2a95f9 - added MySQL-shared-compat.spec(.sh) to the distribution. This spec file 
can be used to build a compatibility package that includes the shared
   libraries of MySQL 3.23.xx and MySQL 4.0.xx for backwards compatibility
   with dynamically linked applications. It simply repackages the two
   MySQL-shared RPMs, so these need to be created or downloaded separately.
 2003-05-06 22:33:08 +02:00
monty@narttu.mysql.fi
112dfa5900 Fixes for fill_help_tables.sql 2003-03-21 18:53:55 +02:00
lenz@mysql.com
1b640ac82d - added support-files/MacOSX to include files specific for building 
MacOSX packages using PackageMaker
 - renamed support-files/PKG -> support-files/SCO (PKG is used in MacOS X
   terminology as well)
 2003-02-03 20:39:48 +01:00
monty@donna.mysql.fi
91c4407e1a Fixed a bug with SELECT DISTINCT and HAVING 2001-05-02 23:39:05 +03:00
monty@donna.mysql.fi
e112299b18 Fixed up mysql-max spec file 2001-04-02 19:49:43 +03:00
monty@donna.mysql.com
cffc2849f9 Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql 2001-02-02 04:09:04 +02:00
tim@threads.polyesthetic.msg
bcd6abea6d Use INSTALL_DATA instead of cp. 
mysql.server is a script, not data.
 2001-02-01 20:49:04 -05:00
monty@donna.mysql.com
9d120741d2 Portability fixes 
Changed TRUNCATE table_name -> TRUNCATE TABLE table_name
 2001-02-02 03:47:06 +02:00
tim@cane.mysql.fi
08d36171a9 Add --with-server-suffix (MYSQL_SERVER_SUFFIX). 2001-01-19 02:46:13 +02:00
monty@donna.mysql.com
830d308960 Fix for SAFE_MUTEX on windows 2000-09-20 19:37:07 +03:00
monty@donna.mysql.com
25106ec755 configure fixes 2000-09-14 15:10:06 +03:00
monty@donna.mysql.com
be5e4e72b6 Small bug fixes 2000-09-07 04:55:17 +03:00
monty@donna.mysql.com
a753a3a2ce Updated benchmark and results for PostgreSQL 7.0.2 
Added more status to the MyISAM files to avoid checking files that
has already been checked.
 2000-08-18 12:48:00 +03:00
bk@work.mysql.com
f4c589ff6c Import changeset 2000-07-31 21:29:14 +02:00