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

50167 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
84d1e3f8f0 Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion 
Problem: GROUP_CONCAT(DISTINCT BIT_FIELD...) uses a tree to store keys;
which are constructed using a temporary table fields,
see Item_func_group_concat::setup().
As a) we don't store null bits in the tree where the bit fields store parts 
of their data and b) there's no method to properly compare two table records
we've got problem.

Fix: convert BIT fields to INT in the temporary table used.
 2007-10-11 17:20:34 +05:00
kaa@polly.(none)
f80541e370 Fix for bug #31174: "Repair" command on MyISAM crashes with small 
myisam_sort_buffer_size.

An incorrect length of the sort buffer was used when calculating the
maximum number of keys. When myisam_sort_buffer_size is small enough,
this could result in the number of keys < number of
BUFFPEK structures which in turn led to use of uninitialized BUFFPEKs.

Fixed by correcting the buffer length calculation.
 2007-10-11 14:28:12 +04:00
kaa@polly.(none)
a32e965e43 Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-10-11 08:37:03 +04:00
kaa@polly.(none)
06a96ec334 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-10-11 08:32:02 +04:00
kaa@polly.(none)
97927cfe32 Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-10-11 08:25:49 +04:00
tsmith@ramayana.hindu.god
f5b2e33154 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-10-10 14:17:54 -06:00
tsmith@ramayana.hindu.god
06c6fce750 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-10-10 14:15:09 -06:00
tsmith@ramayana.hindu.god
070dc3ffb5 Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-10-10 14:12:36 -06:00
tsmith@ramayana.hindu.god
f6d110dc20 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-10-10 14:01:48 -06:00
tsmith@ramayana.hindu.god
ced64f8582 Bug #31517: Potential crash due to access of NULL thd in mark_transaction_to_rollback() 
Introduced in mark_transaction_to_rollback(), part of fix for bug 24989;
fix is to check thd for NULL before using it.
 2007-10-10 14:00:57 -06:00
kaa@polly.(none)
a2cbac3705 Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-10-11 00:00:50 +04:00
kaa@polly.(none)
4e146f3a15 Merge polly.(none):/home/kaa/src/maint/bug28878/my51-bug28878 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-10-10 23:54:35 +04:00
kaa@polly.(none)
03c78594a3 Merge polly.(none):/home/kaa/src/maint/mysql-4.1-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-10-10 23:46:16 +04:00
kaa@polly.(none)
12b6074161 Merge polly.(none):/home/kaa/src/maint/bug28878/my50-bug28878 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-10-10 23:44:01 +04:00
kaa@polly.(none)
9a0b9e03d4 Merge polly.(none):/home/kaa/src/maint/bug28878/my41-bug28878 
into  polly.(none):/home/kaa/src/maint/mysql-4.1-maint
 2007-10-10 23:39:53 +04:00
kaa@polly.(none)
7bd5aa9bd6 Merge polly.(none):/home/kaa/src/maint/bug28878/my50-bug28878 
into  polly.(none):/home/kaa/src/maint/bug28878/my51-bug28878
 2007-10-10 23:23:15 +04:00