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
50314 commits 2784 branches 343 tags 1.6 GiB
Commit graph

50314 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
davi@moksha.com.br
0dce64d635 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
 2007-10-12 11:03:10 -03:00
davi@moksha.com.br
abdd328374 Merge moksha.com.br:/Users/davi/mysql/bugs/post-rename-5.0 
into  moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime
 2007-10-12 10:56:59 -03:00
davi@moksha.com.br
0eea821636 Merge moksha.com.br:/Users/davi/mysql/bugs/post-rename-5.0 
into  moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
 2007-10-12 10:56:50 -03:00
davi@moksha.com.br
b92f3309f1 Bug#31409 RENAME TABLE causes server crash or deadlock when used with HANDLER statements 
If mysql_lock_tables fails because the lock was aborted, we need to
reset thd->some_tables_delete, otherwise we might loop indefinitely
because handler's tables are not closed in a standard way, meaning
that close_thread_tables() (which resets some_tables_deleted) is not
used.

This patch fixes sporadical failures of handler_myisam/innodb tests
which were introduced by previous fix for this bug.
 2007-10-12 10:55:46 -03: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
malff/marcsql@weblab.(none)
fd2bc98871 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-27858-b
 2007-10-11 17:58:32 -06:00
malff/marcsql@weblab.(none)
6428dacd44 Bug#27858 (Failing to log to a log table doesn't log anything to error log) 
Before this patch, failures to write to the log tables (mysql.slow_log
and mysql.general_log) were improperly printed (the time was printed twice),
or not printed at all.

With this patch, failures to write to the log tables is reported in the
error log, for all cases of failures.
 2007-10-11 17:55:18 -06:00
davi@moksha.com.br
2adf38c12e Bug#29223 declare cursor c for SHOW ..... 
"DECLARE CURSOR FOR SHOW ..." is a syntax that currently appears to work,
but is untested for some SHOW commands and does not work for other SHOW
commands.

Since this is an un-intended feature that leaked as a result of a coding bug
(in the parser grammar), the correct fix is to fix the grammar to not accept
this construct.

In other words, "DECLARE CURSOR FOR SHOW <other commands that don't work>"
is not considered a bug, and we will not implement other features to make all
the SHOW commands usable inside a cursor just because someone exploited a bug.
 2007-10-11 17:38:40 -03:00
anozdrin/alik@station.
7237c31698 A patch for BUG#31418: User locks misfunctioning after 
mysql_change_user().

The problem was that THD::ull was not reset in THD::cleanup().

The fix is to reset it.
 2007-10-11 17:11:12 +04: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
davi@moksha.com.br
4515ccf7c0 Post-merge test case for Bug 31409 2007-10-10 21:39:22 -03:00
davi@moksha.com.br
9f088628eb Merge moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime 
into  moksha.com.br:/Users/davi/mysql/bugs/31409-5.1
 2007-10-10 21:16:53 -03:00
davi@moksha.com.br
2f946efda7 Mismerge broken 5.1-runtime compilation because do_command was defined 
static but it's still used by another compilation unit.

Remove static qualifier from do_command definition.
 2007-10-10 21:07:23 -03:00
davi@moksha.com.br
842a11ac9e Merge moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime 
into  moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
 2007-10-10 19:55:23 -03:00
davi@moksha.com.br
ed55fe3d96 Merge moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime 
into  moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
 2007-10-10 19:44:12 -03:00
davi@moksha.com.br
cbbf8fc9b9 Merge moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime 
into  moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
 2007-10-10 19:43:29 -03:00
davi@moksha.com.br
0df3c69597 Merge moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime 
into  moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
 2007-10-10 19:42:35 -03:00
davi@moksha.com.br
0b2bda4c2a Merge moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime 
into  moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
 2007-10-10 19:41:58 -03:00
davi@moksha.com.br
ae462f3e77 Post-merge test case for Bug 21587 2007-10-10 19:06:53 -03:00
davi@moksha.com.br
f74f363aac Merge moksha.com.br:/Users/davi/mysql/bugs/21587-5.0 
into  moksha.com.br:/Users/davi/mysql/bugs/21587-5.1
 2007-10-10 18:17:11 -03: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