mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 23:34:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
50189 commits 2778 branches 343 tags 1.6 GiB
Commit graph

50189 commits

This branch
This branch
All branches
Author SHA1 Message Date
joerg@trift2.
b3fc7aac86 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-10-19 11:50:55 +02:00
joerg@trift2.
7af6d8bf05 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-10-19 11:41:15 +02:00
joerg@trift2.
06b226658b Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-10-19 11:18:15 +02:00
mleich@four.local.lan
09e1c1b0a7 Merge four.local.lan:/WORK2/merge/mysql-5.1-31556 
into  four.local.lan:/WORK/mysql-5.1-build/src-clean
 2007-10-18 16:14:27 +02:00
mleich@four.local.lan
78c900107f Merge four.local.lan:/WORK2/merge/mysql-5.0-31556 
into  four.local.lan:/WORK2/merge/mysql-5.1-31556
 2007-10-18 13:13:21 +02:00
mleich@four.local.lan
8957e54a13 Fix for 
Bug#31556 Test failure: "select hex(ascii(a)) ... order by a" results in different order
 2007-10-18 13:09:30 +02:00
tsmith@ramayana.hindu.god
9727b6dcac Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-10-17 11:23:04 -06:00
tsmith@ramayana.hindu.god
3d203e55e6 Fix syntax error build problem on Windows (variable was defined 
in middle of block)
 2007-10-17 11:22:41 -06:00
kaa@polly.(none)
3a2e673c9f Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-10-17 10:38:26 +04:00
kaa@polly.(none)
63ae0223b1 Merge polly.(none):/home/kaa/src/maint/mysql-4.1-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-10-17 10:32:05 +04:00
kaa@polly.(none)
fa21920020 Fixed the test case for bug #31174 to not fail on 64-bit platforms. 2007-10-17 10:29:51 +04:00
kaa@polly.(none)
a9184873cf Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-10-16 19:25:04 +04:00
kaa@polly.(none)
5cb0d70646 Merge polly.(none):/home/kaa/src/maint/mysql-4.1-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-10-16 19:20:00 +04:00
kaa@polly.(none)
18250925bc Merge polly.(none):/home/kaa/src/maint/bug31174/my41-bug31174 
into  polly.(none):/home/kaa/src/maint/mysql-4.1-maint
 2007-10-16 19:17:00 +04:00
mleich@four.local.lan
77117c83cf Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  four.local.lan:/WORK/mysql-5.1-build/src-clean
 2007-10-16 14:19:15 +02:00
joerg@trift2.
8f60de6d94 Merge trift2.:/MySQL/M50/bug29658-5.0 
into  trift2.:/MySQL/M51/bug29658-5.1
 2007-10-15 20:08:57 +02:00
joerg@trift2.
9dfa790ffc Allow for different directories containing the "libc", 
as it may well happen with 32- vs 64-bit Linux systems.

This patch was proposed immediately with the report of
Bug #29658  wrong test for static nss checking on linux, doesn't cover all platforms
 2007-10-15 19:59:14 +02:00
mleich@four.local.lan
714e2091c5 Fix for 
Bug#31169 Test case does not check whether configuration contains feature tested
 2007-10-15 17:04:43 +02:00
msvensson@pilot.mysql.com
a152ff1672 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
 2007-10-15 10:59:01 +02:00
msvensson@pilot.mysql.com
cecc37d8b4 Merge pilot.mysql.com:/data/msvensson/mysql/bug11589/my50-test_latest 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
 2007-10-15 09:22:11 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
3286de1d91 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b31154/b31154.5.1
 2007-10-15 10:41:26 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
583f5080c4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b31154/b31154.5.0
 2007-10-15 10:40:28 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
71775c2432 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b31154/b31154.5.0
 2007-10-15 10:28:58 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
4c94aaa3b4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b31154/b31154.5.1
 2007-10-15 10:21:22 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
d2251a8fe3 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b30885/b30885.5.0
 2007-10-15 09:57:11 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
b3d7188639 Merge mysql.com:/home/ram/work/b31154/b31154.5.0 
into  mysql.com:/home/ram/work/b31154/b31154.5.1
 2007-10-15 09:44:22 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
d8d0f7f226 Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b30885/b30885.5.1
 2007-10-15 09:43:31 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
981ebebf4e Merge mysql.com:/home/ram/work/b30885/b30885.5.0 
into  mysql.com:/home/ram/work/b30885/b30885.5.1
 2007-10-15 09:41:30 +05:00
mtaylor@solace.(none)
c51df4a534 Merge solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maint 
into  solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
 2007-10-12 13:31:32 -07:00
mtaylor@solace.(none)
4d44d8b316 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
 2007-10-12 13:19:08 -07:00
mtaylor@solace.(none)
427908c490 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
 2007-10-12 13:18:48 -07:00
mtaylor@solace.(none)
f6ba3443e8 Removing 7 year old 3.23 crufty debian dir that is not in use, so as not to cause confusion. 2007-10-12 13:07:39 -07:00
tnurnberg@sin.intern.azundris.com
76d685c435 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  sin.intern.azundris.com:/home/tnurnberg/30951/51-30951
 2007-10-12 16:32:33 +02:00
tnurnberg@sin.intern.azundris.com
c02687815a Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sin.intern.azundris.com:/home/tnurnberg/30951/50-30951
 2007-10-12 16:26:07 +02:00
kaa@polly.(none)
d58ef22d9a Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-10-12 15:15:33 +04:00
kaa@polly.(none)
acae688f46 Merge polly.(none):/home/kaa/src/maint/bug31254/my51-bug31254 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-10-12 15:10:33 +04:00
kaa@polly.(none)
48ada204d1 Merge polly.(none):/home/kaa/src/maint/bug31254/my50-bug31254 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-10-12 15:02:39 +04:00
kaa@polly.(none)
0288f24d21 Merge polly.(none):/home/kaa/src/maint/bug31254/my50-bug31254 
into  polly.(none):/home/kaa/src/maint/bug31254/my51-bug31254
 2007-10-12 14:52:02 +04:00
kaa@polly.(none)
56e85a8cb2 Fix for bug #31254: "Max_data_length" truncated / reported wrong 
(compiler issue ?)

Problem:

Improper compile-time flags on AIX prevented use of files > 2 GB. This
resulted in Max_data_length being truncated to 2 GB by MyISAM code.

Solution:

Reverted large-file changes from the fix for bug10776. We need to define
_LARGE_FILES on AIX to have support for files > 2 GB.

 Since _LARGE_FILE_API is incompatible with _LARGE_FILES and may be
automatically defined by including standards.h, we also need a
workaround to avoid this conflict.
 2007-10-12 14:03:51 +04:00
tnurnberg@sin.intern.azundris.com
3d230dda77 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  sin.intern.azundris.com:/home/tnurnberg/30951/51-30951
 2007-10-12 11:56:51 +02:00
tnurnberg@sin.intern.azundris.com
7754e54bd0 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sin.intern.azundris.com:/home/tnurnberg/30951/50-30951
 2007-10-12 11:54:44 +02:00
tnurnberg@sin.intern.azundris.com
0ea99b5e27 Merge sin.intern.azundris.com:/home/tnurnberg/30951/50-30951 
into  sin.intern.azundris.com:/home/tnurnberg/30951/51-30951
 2007-10-12 11:47:28 +02:00
tnurnberg@sin.intern.azundris.com
57dc381268 Bug#30951: makedate returns different results depending on version of mysql 
makedate() will fold years below 100 into the 1970-2069 range. CS removes code
that also wrongly folded years between 100 and 200 into that range, which should
be left unchanged. Backport from 5.1.
 2007-10-12 11:46:48 +02:00
tnurnberg@sin.intern.azundris.com
07741935ca Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  sin.intern.azundris.com:/home/tnurnberg/30821/51-30821
 2007-10-12 11:38:18 +02:00
tnurnberg@sin.intern.azundris.com
fa942cf8d0 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sin.intern.azundris.com:/home/tnurnberg/30821/50-30821
 2007-10-12 11:30:53 +02:00
tnurnberg@sin.intern.azundris.com
3fa3acacac Merge sin.intern.azundris.com:/home/tnurnberg/30821/50-30821 
into  sin.intern.azundris.com:/home/tnurnberg/30821/51-30821
 2007-10-12 11:25:16 +02:00
tnurnberg@sin.intern.azundris.com
5c21619b3a Bug#30821: setting --tc_heuristic_recover tries to set myisam_stats_method 
Options to mysqld were not processed correctly because switch statement
was missing some "break"s. CS adds them.

No test case; would require .opt file and server restart. Manually tested.
 2007-10-12 11:23:45 +02:00
mtaylor@solace.(none)
f31d2ab3c8 Merge solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maint 
into  solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
 2007-10-12 02:18:13 -07:00
mtaylor@solace.(none)
709bb3948c Removed debian dir. It was a mistake to embed it in the tree in the first place. 2007-10-12 02:15:32 -07:00
mleich@four.local.lan
6f2d47db9e Fix for 
Bug#31411 funcs_1: ndb_<every test> fail because of changed server error number
= Adjust the files with expected results
 2007-10-11 19:39:18 +02:00