mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
50672 commits 2780 branches 343 tags 1.6 GiB
Commit graph

50672 commits

This branch
This branch
All branches
Author SHA1 Message Date
holyfoot/hf@mysql.com/hfmain.(none)
f8958d0572 bug #29801 Federated engine crashes local server 
if remote server sends malicious response.

We need to check if the SHOW TABLE STATUS query we issue inside the
FEDERATED engine returned the result with the proper (or just sufficient)
number of rows. Otherwise statements like row[12] can crash the server.
 2007-10-15 10:11:52 +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
gkodinov/kgeorge@magare.gmz
deb62b6c77 Merge magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.1-opt
 2007-10-14 11:30:28 +03:00
gkodinov/kgeorge@magare.gmz
f0d5ed8147 item_sum.cc: 
Fixed dbug macros usage errors
 2007-10-14 11:28:43 +03:00
aelkin/elkin@koti.dsl.inet.fi
8f7550ecad manual merge for bug_29136, bug#29309. 2007-10-13 23:12:50 +03:00
aelkin/elkin@koti.dsl.inet.fi
a7b1a823a5 Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug29136-mdelete 
into  koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1
 2007-10-13 16:51:16 +03:00
aelkin/elkin@koti.dsl.inet.fi
ed0ab76e28 Bug #29136 erred multi-delete on trans table does not rollback the statement 
similar to bug_27716, but it was stressed on in the synopsis on that there is another
side of the artifact affecting behaviour in transaction.

Fixed with deploying multi_delete::send_error() - otherwise never called - and refining its logic
to perform binlogging job if needed.

The changeset includes the following side effects:
- added tests to check bug_23333's scenarios on the mixture of tables for multi_update;
- fixes bug@30763 with two-liner patch and a test coinciding to one added for bug_23333.
 2007-10-13 15:49:42 +03:00
gkodinov/kgeorge@magare.gmz
3c0ca8259f Merge magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B31156-5.1-opt
 2007-10-13 09:22:37 +03:00
gkodinov/kgeorge@magare.gmz
a4da332ea5 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.0-opt
 2007-10-13 09:20:23 +03:00
gkodinov/kgeorge@magare.gmz
ce1ce20e73 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.1-opt
 2007-10-13 09:13:00 +03:00
gkodinov/kgeorge@magare.gmz
737dd70435 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.0-opt
 2007-10-13 09:12:15 +03: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
gshchepa/uchum@gleb.loc
1e3fd4942e Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-10-12 22:55:33 +05:00
mats@kindahl-laptop.dnsalias.net
bcef0be8a6 BUG#29549 (Endians: rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb and rpl_ndb_mix_innodb failed on): 
Post-merge fixes. Setting write bit before calling Field::store() since the function asserts that
the write bit has been set.
 2007-10-12 18:22:31 +02:00
gshchepa/uchum@gleb.loc
f9c7587d8e Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-10-12 20:54:54 +05: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
mats@kindahl-laptop.dnsalias.net
d32c1d616e Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
 2007-10-12 13:24:28 +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
gkodinov/kgeorge@magare.gmz
df422f7c3f Merge magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B31440-5.1-opt
 2007-10-12 14:14:27 +03:00
gkodinov/kgeorge@magare.gmz
d330469f10 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.0-opt
 2007-10-12 14:11:27 +03: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
holyfoot/hf@hfmain.(none)
bf9be15bd2 Merge mysql.com:/home/hf/work/31155/my50-31155 
into  mysql.com:/home/hf/work/31155/my51-31155
 2007-10-12 15:37:42 +05:00
holyfoot/hf@hfmain.(none)
46cbb26b04 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/31155/my51-31155
 2007-10-12 15:36:51 +05:00
holyfoot/hf@hfmain.(none)
a453b2f715 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/31155/my50-31155
 2007-10-12 15:35:16 +05:00
holyfoot/hf@hfmain.(none)
44325614ec Merge mysql.com:/home/hf/work/31155/my50-31155 
into  mysql.com:/home/hf/work/31155/my51-31155
 2007-10-12 15:33:26 +05: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
mats@kindahl-laptop.dnsalias.net
d8adc641a0 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b29549-mysql-5.1-target-5.1.22
 2007-10-12 09:40:24 +02:00