Sergei Golubchik
c4341d5095
5.2 -> 5.3
2013-02-28 21:48:47 +01:00
Sergei Golubchik
5dec570d7c
5.1 -> 5.2 merge
2013-02-28 19:00:58 +01:00
Sergei Golubchik
08ba257846
mysql-5.1 merge
...
mysys/errors.c:
revert upstream's fix. use a much simpler one
mysys/my_write.c:
revert upstream's fix. use a simpler one
sql/item_xmlfunc.cc:
useless, but ok
sql/mysqld.cc:
simplify upstream's fix
storage/heap/hp_delete.c:
remove upstream's fix.
we'll use a much less expensive approach.
2013-02-28 09:58:39 +01:00
Sergei Golubchik
4f67a14700
5.2->5.3 merge
2013-01-10 15:40:21 +01:00
Sergei Golubchik
bd87fed1dc
5.1 merge
2013-01-10 13:54:04 +01:00
Sergei Golubchik
2e11ca36f2
mysql-5.1.67 merge
2013-01-09 23:51:51 +01:00
Hery Ramilison
40bbd18623
Applying patch for Bug#67177 Bug#15967374 from Kent
2013-01-08 13:29:11 +01:00
Vladislav Vaintroub
3b572cd119
MDEV-712 - LP:1024239 - Mysqlclient exports the same symbols as openssl
...
Compile yassl and taocrypt using -fvisibility=hidden, when possible. This prevent symbols from being exported.
2012-11-23 13:50:46 +01:00
Sergei Golubchik
b01fbb8e48
bump the version to 5.3.11
2012-11-23 13:11:31 +01:00
unknown
f716806a90
Increase the version number to 5.3.10.
2012-11-10 00:10:06 +02:00
unknown
7c23d6d0c6
Merge MySQL 5.1.66 -> MariaDB 5.1.65
2012-11-06 11:52:55 +02:00
unknown
350bf6cb39
Raise version number after cloning 5.1.67
2012-11-05 11:05:46 +01:00
Sergei Golubchik
9bf8a5937f
increase the version
2012-10-01 15:42:49 +02:00
unknown
95a937e368
Raise version number after cloning 5.1.66
2012-09-07 10:30:53 +02:00
Sergei Golubchik
cefc30b166
merge with MySQL 5.1.65
2012-08-22 11:40:39 +02:00
Bjorn Munch
0893a90fd7
Reverting broken configure/make stuff
2012-07-19 15:55:41 +02:00
Bjorn Munch
6aaf157985
Bug #14035452 - MODULARIZE MYSQL_CLIENT_TEST
...
Added new minimal client using same framework
Added internal test using it
Small changes to top level make/configure/cmake to have it built
2012-07-19 12:57:36 +02:00
unknown
4c33e849f1
Raise version number after cloning 5.1.65
2012-07-11 15:18:34 +02:00
unknown
bc42eaf952
Raise version number after cloning 5.1.64
2012-06-15 13:31:27 +02:00
Sergei Golubchik
7f6f53a8df
5.2 merge
2012-05-20 14:57:29 +02:00
Sergei Golubchik
280fcf0808
5.1 merge
2012-05-18 14:23:05 +02:00
Sergei Golubchik
0a8c9b98f6
merge with mysql-5.1.63
2012-05-17 12:12:33 +02:00
Sergei Golubchik
d335b47191
update the version number
2012-05-02 22:02:17 +02:00
Georgi Kodinov
b61d6be9fd
Raise version number after cloning 5.1.63
2012-04-17 13:25:41 +03:00
Sergei Golubchik
cbd52a42ee
merge
2012-04-05 12:01:52 +02:00
Sergei Golubchik
dea3544b2d
mysql-5.1.62 merge
2012-04-05 10:49:38 +02:00
Michael Widenius
01e43ca92f
Increased version number
2012-03-26 11:46:01 +03:00
Sergey Petrunya
ad8ccccc2c
Bump the version number.
2012-02-26 11:44:52 +04:00
Georgi Kodinov
c3ea39b2c7
merged and updated the version in mysql-5.1
2012-02-21 14:14:52 +02:00
Georgi Kodinov
bdd1a2f17a
bumped up the version of the main tree to match the security tree
2012-02-21 14:13:31 +02:00
Karen Langford
457af3df74
Raise version number after cloning 5.1.62
2012-02-20 17:03:24 +01:00
Michael Widenius
ae07ec6cbf
Merge with MYSQL 5.1.61
...
Fixed README with link to source
Merged InnoDB change to XtraDB
README:
Added information of where to find MariaDB code
storage/archive/ha_archive.cc:
Removed memset() of rows, a MariaDB checksum's doesn't touch not used data.
2012-02-20 16:23:18 +02:00
Igor Babaev
7b79d8a33f
Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.
2012-02-01 15:48:02 -08:00
unknown
0868847b55
Update version in configure.in (was forgotten in 5.3.3 release).
2011-12-30 20:22:52 +01:00
Michael Widenius
629cdab808
Fixed compiler and test failures found by buildbot
...
configure.in:
Added testing of STRNDUP (not found on solaris)
mysql-test/include/wait_until_connected_again.inc:
Also test for error 2005 (can happen on windows)
mysql-test/include/wait_until_disconnected.inc:
Also test for error 2005 (can happen on windows)
mysql-test/suite/innodb_plugin/r/innodb_bug30423.result:
Number of rows is not stable (found difference on Solaris)
mysql-test/suite/innodb_plugin/t/innodb_bug30423.test:
Number of rows is not stable (found difference on Solaris)
plugin/auth_pam/auth_pam.c:
Use internal strndup if it doesn't exist on system (solaris)
Changed code so that it should also compile on solaris.
2012-01-08 20:29:05 +02:00
Sergey Petrunya
5d9fbc6177
Fix version number: it's 5.3.3
2011-12-20 12:13:47 +04:00
Sergey Petrunya
2bfd02cea9
Bump version number: now it's 5.3.3 (5.3.2 has been released some time ago)
2011-12-18 19:25:00 +04:00
Joerg Bruehe
b42c3932f8
Raise version number after cloning
2011-12-16 12:33:54 +01:00
Joerg Bruehe
2d63ea643b
Raise version number after cloning
2011-12-16 12:31:57 +01:00
unknown
c67d63ca5b
Raise version number after cloning 5.1.61
2011-12-16 12:24:05 +01:00
Michael Widenius
511fd82b26
Merge with 5.2
2011-12-14 20:36:51 +02:00
Michael Widenius
1a985a17c0
Merge with 5.1
...
Updated version number in configure
2011-12-13 20:08:41 +02:00
Sergei Golubchik
a3e8ce275c
new "./configure --disable-distribution" option
2011-12-12 16:28:16 +01:00
Sergei Golubchik
745c53ec06
5.2->5.3 merge
2011-12-12 13:00:33 +01:00
Michael Widenius
6d4224a31c
Merge with 5.2.
...
no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit
2011-12-11 11:34:44 +02:00
Sergei Golubchik
1f3e540385
updated the version in configure
2011-12-03 22:44:33 +01:00
Michael Widenius
7ee1790976
Merge with 5.1
2011-12-01 20:14:53 +02:00
Michael Widenius
dad1322940
Fixed that --with-libedit --without-readline works
...
Fixed buildbot failures (compiler warnings, failing tests)
cmd-line-utils/libedit/map.c:
Fixed compiler warning
cmd-line-utils/libedit/terminal.c:
Fixed compiler warning
cmd-line-utils/libedit/tty.c:
Fixed compiler warning
configure.in:
Fixed that --with-libedit --without-readline works
mysql-test/suite/innodb_plugin/t/innodb_misc1.test:
Fixed test that failed when characterset was missing
2011-12-01 20:11:41 +02:00
Michael Widenius
6920457142
Merge with MariaDB 5.1
2011-11-24 18:48:58 +02:00
Michael Widenius
7b368e3810
Merge with MySQL 5.1.60
2011-11-23 19:32:14 +02:00
