mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
42954 commits 2793 branches 343 tags 1.5 GiB
Commit graph

42954 commits

This branch
This branch
All branches
Author SHA1 Message Date
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
ac0cab1589 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b26012/b26012.5.0
 2007-02-01 19:55:11 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
9d46fd5cc4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b26012/b26012.5.1
 2007-02-01 19:53:26 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
6136556fba Merge mysql.com:/home/ram/work/b26012/b26012.5.0 
into  mysql.com:/home/ram/work/b26012/b26012.5.1
 2007-02-01 19:52:33 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
7bcf2bf338 Merge mysql.com:/home/ram/work/b26012/b26012.4.1 
into  mysql.com:/home/ram/work/b26012/b26012.5.0
 2007-02-01 19:51:45 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d710853fb8 Fix for bug #26012: missed Field_double::size_of() 
As we have Field_double::not_fixed we must have Field_double::size_of().
 2007-02-01 19:51:02 +04:00
lzhou/zhl@dev3-63.(none)
e208018f75 Merge dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb
 2007-02-01 15:48:23 +00:00
gluh@mysql.com/eagle.(none)
d1185aaeaf Bug#23299 Some queries against INFORMATION_SCHEMA with subqueries fail 
additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter
 2007-02-01 19:12:45 +04:00
istruewing@chilla.local
b0e8f2b534 Bug#25844: "make test" does not find mysql-test-run.pl 
Need to change directory before calling mysql-test-run.pl
 2007-02-01 15:59:51 +01:00
joerg@trift2.
9af6d01e3c Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-02-01 15:57:01 +01:00
istruewing@chilla.local
33e1d1091a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-02-01 15:51:25 +01:00
lzhou/zhl@dev3-63.(none)
956636767e BUG#22025 Return correct error message when transporter error occured. Modify content of message structure of last patch. 2007-02-01 14:37:43 +00:00
cmiller@zippy.cornsilk.net
9e4c483cc0 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-02-01 09:21:09 -05:00
istruewing@chilla.local
54bf789a6d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-02-01 15:15:40 +01:00
gluh@mysql.com/eagle.(none)
010dc0b55c Valgrind error fixes 
Notes:
This patch doesn't fix all issues in the tree and we need jani's fix for that
This patch shoud not be merged into 5.0
 2007-02-01 18:00:24 +04:00
mskold/marty@mysql.com/linux.site
0e20ef0ae4 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-02-01 13:59:34 +01:00
gkodinov/kgeorge@rakia.gmz
d9ae9ce58d Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt
 2007-02-01 13:26:25 +02:00
gkodinov/kgeorge@rakia.gmz
95154f86b5 trigger.result: 
merge of the 5.0-opt tree
 2007-02-01 13:25:50 +02:00
istruewing@chilla.local
1c34270464 Merge chilla.local:/home/mydev/mysql-4.1-axmrg 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-02-01 10:19:22 +01:00
gkodinov/kgeorge@rakia.gmz
f697acb0ca Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt
 2007-02-01 11:07:17 +02:00
gkodinov/kgeorge@rakia.gmz
1096dbd5fa Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.1-opt
 2007-02-01 10:59:14 +02:00
mskold/marty@linux.site
a1710e2033 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-02-01 09:55:11 +01:00
gkodinov/kgeorge@rakia.gmz
0d40608fff Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.gmz:/home/kgeorge/mysql/autopush/B25551-5.0-opt
 2007-02-01 10:50:41 +02:00
mskold/marty@linux.site
491b78be67 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2007-02-01 09:50:38 +01:00
mskold/marty@mysql.com/linux.site
c16251ad7c Bug #25522 Update with IN syntax Clustertable + Trigger leads to mysqld segfault: moved back assignment 2007-02-01 09:48:45 +01:00
istruewing@chilla.local
a3705af35f Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-02-01 09:26:09 +01:00
mskold/marty@linux.site
5aaa74a41a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-02-01 08:49:09 +01:00
istruewing@chilla.local
73e61944f7 Merge chilla.local:/home/mydev/mysql-4.0-axmrg 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-02-01 08:09:36 +01:00
istruewing@chilla.local
97cf413d55 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-02-01 07:52:28 +01:00
stewart@willster.(none)
48649030cb BUG#25323 NDB binlog timer prints incorrect stats 
fix time period calculation
 2007-02-01 17:28:41 +11:00
stewart@willster.(none)
71097eff45 BUG#23571 missing jamEntry() after EXECUTE_DIRECT in lqh 
add the jamEntry()
 2007-02-01 17:19:19 +11:00
brian@zim.(none)
acd1201504 Reworked a section of code that caused valgrind errors (and that partitioning was not happy about). 2007-01-31 20:13:17 -08:00
igor@olga.mysql.com
710136217b Fixed bug #25407. 
The bug could cause choosing a sub-optimal execution plan for 
a single-table query if a unique index with many null keys were 
defined for the table. 
It happened because the code of the check_quick_keys function 
made an assumption that any key may occur in an unique index 
only once. Yet this is not true for keys with nulls that may 
have multiple occurrences in the index.
 2007-01-31 19:31:36 -08:00
mskold/marty@linux.site
201705a4b4 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-01-31 22:58:03 +01:00
mskold/marty@linux.site
4cc8da4d39 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2007-01-31 22:43:24 +01:00
mskold/marty@mysql.com/linux.site
5cd40ad30b Bug #25522 Update with IN syntax Clustertable + Trigger leads to mysqld segfault: in start_stmt, only change query_state if starting a new transactions, in read_multi_range_next, change query state when end is reached 2007-01-31 22:38:06 +01:00
cmiller@zippy.cornsilk.net
a795b7097f Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2007-01-31 16:26:12 -05:00
cmiller@zippy.cornsilk.net
522d6fb0cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-01-31 16:24:28 -05:00
cmiller@zippy.cornsilk.net
85896c0af5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2007-01-31 16:23:10 -05:00
cmiller@zippy.cornsilk.net
ad66e7a0dd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-01-31 16:23:05 -05:00
cmiller@zippy.cornsilk.net
b81f4a8314 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my51-bug25341 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-01-31 16:14:42 -05:00
cmiller@zippy.cornsilk.net
5a0ac8afe7 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-01-31 16:14:12 -05:00
cmiller@zippy.cornsilk.net
a3a9d8bd84 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my51-bug25341
 2007-01-31 16:09:36 -05:00
cmiller@zippy.cornsilk.net
24e3508b0e Bug#25341: "init.d/mysql stop" may timeout too quickly 
Thirty five seconds is entirely too short of a period to wait for a server 
to exit.  Instead, make a valliant effort to make sure it exits, and only
give up after a very long period (arbitrarily chosen as 15 minutes).

In addition, if we're being asked to restart the server, then don't try
to start again if trying to stop the server failed.
---
Return zero by default, when the script exits.
---
Set return-/exit-value based on whether we successfully dealt with the 
PID-file.
---
Don't wait that long if the program we're waiting on exits.  It 
should only exit if the server is not going to be started.
 2007-01-31 15:39:41 -05:00
mtaylor@qualinost.(none)
13b35c4323 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
 2007-01-31 15:39:03 -05:00
mtaylor@qualinost.(none)
50796a040e Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
 2007-01-31 15:37:12 -05:00
mtaylor@qualinost.(none)
777c5de911 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
 2007-01-31 15:35:26 -05:00
df@kahlann.erinye.com
3f12c914b7 use MTR_BUILD_THREAD=auto for rpm builds 2007-01-31 19:01:46 +01:00
df@kahlann.erinye.com
1f9236d065 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
 2007-01-31 18:58:00 +01:00
df@kahlann.erinye.com
9fe01abcca Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2007-01-31 18:54:15 +01:00
joerg@trift2.
852321c7f8 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-01-31 18:20:23 +01:00