mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
60155 commits 2784 branches 343 tags 1.6 GiB
Commit graph

1652 commits

Author SHA1 Message Date
Alexey Kopytov
84766b060a Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. 
Conflicts:

Text conflict in scripts/Makefile.am
Text conflict in sql/share/Makefile.am
 2010-02-26 16:06:31 +03:00
Alexander Nozdrin
e7e1a36755 Manual merge from mysql-trunk. 2010-02-23 17:06:06 +03:00
Alexey Kopytov
f0d2fe34f2 Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 
Conflicts:

Text conflict in client/mysqltest.cc
Text conflict in configure.in
Text conflict in mysql-test/include/mtr_warnings.sql
 2010-02-23 16:26:45 +03:00
Timothy Smith
62dd09d725 auto-merge 2010-02-22 16:34:04 -07:00
Timothy Smith
9228717f7c merge 2010-02-17 12:36:16 -07:00
Timothy Smith
2e7266e7ef Request that internals mailing list be notified if the MySQL version formatting changes 2010-02-17 12:00:18 -07:00
unknown
0a7b5fb045 Merge from mysql-5.1.44-release 2010-02-17 18:48:40 +01:00
unknown
62db6839b8 configure.in 
- Changes to the banner text
 - Use older AC_PROG_LIBTOOL (Bug#51009)

scripts/mysql_install_db.sh
 - Changes to banner text
 2010-02-17 18:39:28 +01:00
unknown
c142ef4679 Raise version number after cloning 5.5.2-m2 2010-02-12 20:17:53 +01:00
Georgi Kodinov
792fc9f784 Bug #35250: readline check breaks when doing vpath build 
Fixed several (obvious) places that don't work with vpath
build.
 2010-02-12 18:28:35 +02:00
Joerg Bruehe
5d115bbe0c Upmerge "configure.in" text change from 5.1 to 5.5 ("trunk"), 
fixing bug#50950.
 2010-02-08 22:16:07 +01:00
Joerg Bruehe
ed75cda355 Upmerge "configure.in" text change from 5.0 to 5.1, 
fixing bug#50950.
 2010-02-08 21:40:17 +01:00
Joerg Bruehe
72da6b3185 Bug#50950 Obsolete reference to www.mysql.com 
in message printed at end of configure

New text for the success message of "configure".

configure.in:
  The message must be changed to drop the "www.mysql.com" URL.
 2010-02-08 21:10:37 +01:00
Alexander Nozdrin
7e0d0dd040 Cherry-pick merge from mysql-5.1-bugteam. 
Original revision:
------------------------------------------------------------
revision-id: kent.boortz@sun.com-20100204182709-dw1dwpglkd5qrehb
committer: Kent Boortz <kent.boortz@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2010-02-04 19:27:09 +0100
message:
  LT_INIT and LT_PREREQ was added in libtool 2.2 2008, a bit too
  recent, switched back to the older AC_PROG_LIBTOOL
------------------------------------------------------------
 2010-02-05 18:31:06 +03:00
unknown
88519d1c8f Raise version number after cloning 5.1.44 2010-02-04 12:23:33 +01:00
Alexander Nozdrin
1a46ff873e Manual merge from mysql-5.1-bugteam. 
Conflicts:
  - configure.in
  - mysql-test/include/setup_fake_relay_log.inc
  - sql/sql_select.cc
 2010-02-03 20:22:58 +03:00
Georgi Kodinov
d0ac5a75b3 merge 2010-02-03 17:25:29 +02:00
Georgi Kodinov
44c1a79b0e merge 2010-02-03 17:05:06 +02:00
Kent Boortz
673ec7b24d Changes to be able to create source TAR packages with longer 
path names than 99 characters, using the USTAR format of the
resulting source TAR.

To be able to specify the use of USTAR when creating the source
TAR, we needed both to update the GNU autotools version requirements
slightly, and update the initiation of the tools to use more
modern constructs.
 2010-02-02 23:29:14 +01:00
Staale Smedseng
694d50c71e Bug#50409 Solaris 8 compatibility broken by assumption about 
printstack() being present

When Bug#47391 was fixed, no assumption was made that support
for Solaris 8 was needed. Solaris 8 lacks printstack(), and 
the build breaks because of this.

This patch adds a test for the presence of printstack() to
configure.in for 5.0, and uses HAVE_PRINTSTACK to make
decisions rather than the __sun define.
 2010-01-27 11:38:50 +01:00
unknown
2fdaf377a2 Raise version number after cloning 5.1.43 2010-01-15 18:03:48 +01:00
unknown
85c1e30375 Raise version number after cloning 5.0.90 2010-01-15 10:35:35 +01:00
MySQL Build Team
b41937105a Automerge the 5.5.1-m2 release back into the main branch. 2010-01-15 01:10:40 +01:00
Georgi Kodinov
90274e3709 merge 2010-01-13 12:47:42 +02:00
Georgi Kodinov
6e72f4171f merge 5.1-main to 5.1-bugteam 2010-01-13 12:28:42 +02:00
Joerg Bruehe
c591ee5923 Upmerge the changes for RPM versioning/naming from 5.0 to 5.1. 
This includes "MYSQL_U_SCORE_VERSION" in "configure.in".
 2010-01-12 12:57:51 +01:00
Joerg Bruehe
71465af9d4 Implement the change of RPM versioning and file naming: 
- "release" starts from 1
- "level" ("m2", "rc", ...) is included in the RPM version.
 2010-01-12 12:41:18 +01:00
Joerg Bruehe
4f1331417c Automerge from main tree. 2010-02-04 20:32:25 +01:00
Kent Boortz
deb0d106e5 LT_INIT and LT_PREREQ was added in libtool 2.2 2008, a bit too 
recent, switched back to the older AC_PROG_LIBTOOL
 2010-02-04 19:27:09 +01:00
Joerg Bruehe
7a84896d71 Change RPM file naming: 
- Suffix like "-m2", "-rc" becomes part of version as "_m2", "_rc".
- Release counts from 1, not 0.

This is done for both the "generic" RPMs and the "shared-compat" ones.
It includes introducing a new version variable "MYSQL_U_SCORE_VERSION"
in "configure.in", where the dash is replaced by an underscore:
  5.5.1-m2   ->  5.5.1_m2
 2009-12-22 23:22:42 +01:00
unknown
1aed2f4d63 Raise version number after cloning 5.5.1-m2 2009-12-22 14:27:41 +01:00
Alexander Nozdrin
8933c6f5f4 Auto-merge from mysql-trunk. 2009-12-19 11:20:21 +03:00
MySQL Build Team
d11111f1a6 Fix the version suffix, we use "-m2" currently. 2009-12-16 12:08:12 +01:00
MySQL Build Team
29f5396126 Automerge with an intermediate build clone, 
to prepare for a tree parent alignment.
No code changes.
 2009-12-16 11:51:47 +01:00
Alexey Kopytov
ebdef570e5 Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2009-12-11 19:40:58 +03: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
unknown
91aa5e248e Raise version number after cloning 5.0.89 2009-12-08 16:35:00 +01:00
Staale Smedseng
7a14bfa52d Merge from 5.0 2009-12-06 19:01:11 +01:00
unknown
755e84f683 Raise version number after cloning 5.1.42 2009-12-02 18:52:19 +01:00
Alexey Kopytov
adb89e98aa Manual merge from the mysql-5.1-bugteam. 2009-11-24 11:31:36 +03:00
Alexey Kopytov
a460914482 Manual merge from the mysql-5.1-bugteam. 2009-11-24 11:19:06 +03:00
Davi Arnaut
64f097dc80 Post-merge fixes: fix typo and remove unused variables. 2009-11-21 10:11:45 -02:00
Georgi Kodinov
2961cf6787 merge 2009-11-20 15:39:15 +02:00
unknown
76e39b1c09 Raise version number after cloning 5.5.0-beta 2009-11-13 16:15:38 +01:00
unknown
c7b07ff0cb Raise version number after cloning 5.0.88 2009-11-09 19:22:35 +01:00
Alexander Nozdrin
d476bbb0be Auto-merge from mysql-next-mr. 2009-11-05 15:08:37 +03:00
unknown
a95f54c6d8 Raise version number after cloning 5.1.41 2009-11-04 19:22:09 +01:00
Sergei Golubchik
3d23068f3a WL#4903 Plugin Service API part I 
(mysql-next-mr backport)
 2009-11-02 21:05:42 +01:00
Alexander Nozdrin
22fe8e10e2 Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
Davi Arnaut
b7ceeccdbe Introduce support for automake-1.11 silent-rules. 
configure.in:
  Activate silent-rules if automake supports it.
 2009-11-05 07:48:50 -02:00