cmiller@zippy.cornsilk.net
b074e13483
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-02 17:51:59 -05:00
iggy@rolltop.ignatz42.dyndns.org
deb03b93ec
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my51-mtr_vs_config
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
2006-11-02 15:14:50 -05:00
iggy@rolltop.ignatz42.dyndns.org
cf65c157ee
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my51-mtr_vs_config
2006-11-02 15:11:22 -05:00
iggy@rolltop.ignatz42.dyndns.org
9f329f2cf2
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my41-mtr_vs_config
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config
2006-11-02 15:09:23 -05:00
iggy@rolltop.ignatz42.dyndns.org
39d7c5a6bc
Bug#23865 mysql-test-run.pl on Windows only supports debug and release configurations
...
Visual Studio builds each configuration in a different sub-directory. Only the sub-
directories for release and debug are currently searched.
2006-11-02 15:05:20 -05:00
cmiller@calliope.local
7b973f394f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into calliope.local:/Volumes/Source/src/mysql-5.1-maint
2006-11-02 14:28:40 -05:00
cmiller@calliope.local
948b9831a8
Fixed misuse of automake _DEPENDENCIES item. It caused Make try to create
...
a bogus dependency "-lz" .
2006-11-02 14:26:54 -05:00
ramil/ram@myoffice.izhnet.ru
4747665224
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/mysql-5.1-maint
2006-11-02 17:13:10 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
26117992be
Fix for bug #23762 : partition.test fails (partition_hash, partition_pruning as well)
...
When partition pruning is used we have to initialize key_part->flag in the
create_partition_index_descr() as it's checked in the get_mm_leaf().
2006-11-02 17:11:53 +04:00
ramil/ram@myoffice.izhnet.ru
c8aa094849
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug22913/my51-bug22913
2006-11-02 16:15:01 +04:00
thek@kpdesk.mysql.com
d4b3cefb23
Bug#22828 complementary patch:
...
- 'false' not defined in C, use FALSE instead.
2006-11-02 11:55:41 +01:00
ramil/ram@myoffice.izhnet.ru
9b99d8c747
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug22913/my51-bug22913
2006-11-02 14:42:45 +04:00
ramil/ram@myoffice.izhnet.ru
77b0a44146
Merge mysql.com:/usr/home/ram/work/bug22913/my50-bug22913
...
into mysql.com:/usr/home/ram/work/bug22913/my51-bug22913
2006-11-02 14:35:42 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
9361705934
Merge mysql.com:/usr/home/ram/work/bug22913/my41-bug22913
...
into mysql.com:/usr/home/ram/work/bug22913/my50-bug22913
2006-11-02 14:33:22 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a072688eea
Fix for bug #22913 : mysql --quick doesn't report some errors.
...
We don't check for errors that may occur during data printing.
2006-11-02 14:32:00 +04:00
thek@kpdesk.mysql.com
5f2424ead7
Merge kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
2006-11-02 08:47:21 +01:00
kostja@bodhi.local
b2978f9ee8
A post-merge fix.
2006-11-02 08:58:51 +03:00
kostja@bodhi.local
aaeef40e72
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-11-02 03:30:16 +03:00
kostja@bodhi.local
965669d1f9
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-11-02 03:24:11 +03:00
kostja@bodhi.local
5196eadc06
Merge bodhi.local:/opt/local/work/mysql-4.1-runtime
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
2006-11-02 02:38:41 +03:00
kostja@bodhi.local
b471ea50f7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
2006-11-02 01:21:37 +03:00
kostja@bodhi.local
6a28c436f7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bodhi.local:/opt/local/work/mysql-4.1-runtime
2006-11-02 01:08:39 +03:00
thek@kpdesk.mysql.com
35b833eb86
Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
2006-11-01 17:01:51 +01:00
jonas@perch.ndb.mysql.com
7acfde913a
ndb - revert bug to wait for "proper" bug fix
...
bug#21052
2006-11-01 16:14:49 +01:00
msvensson@shellback.(none)
51e467d0fe
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-01 15:59:15 +01:00
dlenev@mockturtle.local
5961d4721f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mockturtle.local:/home/dlenev/src/mysql-5.0-hash-2
2006-11-01 16:20:15 +03:00
dlenev@mockturtle.local
9ac5ed6784
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-hash-2
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2006-11-01 15:46:40 +03:00
dlenev@mockturtle.local
bd1b57f930
Small cleanup in code handling stored routines/table prelocking.
...
Use lazy initialization for Query_tables_list::sroutines hash.
This step should significantly decrease amount of memory consumed
by stored routines as we no longer will allocate chunk of memory
required for this HASH for each statement in routine.
2006-11-01 15:41:48 +03:00
joerg@trift2.
0d27df6f1a
Merge trift2.:/MySQL/M51/clone-5.1
...
into trift2.:/MySQL/M51/push-5.1
2006-11-01 13:26:03 +01:00
thek@kpdesk.mysql.com
df82f58477
Merge kpdesk.mysql.com:/home/thek/dev/bug22828/my41-bug22828
...
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
2006-11-01 09:24:57 +01:00
msvensson@shellback.(none)
b9d4ccbf18
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-31 19:08:30 +01:00
msvensson@shellback.(none)
2754edbaf3
Improve the reading of .pid files from var/run
...
- Only read *.pid
- Only allow it to contain a number
2006-10-31 19:02:33 +01:00
msvensson@shellback.(none)
64eb65533e
Make variables static to please Netware compiler
2006-10-31 18:51:23 +01:00
msvensson@shellback.(none)
c6c0dcdc0d
Remove warning, exe_mysql_fix_system_tables are not available on windows
2006-10-31 17:16:07 +01:00
jonas@perch.ndb.mysql.com
543e73d663
Merge perch.ndb.mysql.com:/home/jonas/src/50-multi
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-10-31 16:15:15 +01:00
jonas@perch.ndb.mysql.com
b5e1d6f2a3
Merge perch.ndb.mysql.com:/home/jonas/src/50-multi
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-31 16:13:01 +01:00
jonas@perch.ndb.mysql.com
c6308d652d
ndb - ndb_multi spurious failure
...
remove timeing dependant part of test
2006-10-31 16:09:31 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b1e77ed1fd
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug22723/my50-bug22723
2006-10-31 13:28:44 +04:00
ramil/ram@myoffice.izhnet.ru
1532622b27
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug22723/my51-bug22723
2006-10-31 13:19:45 +04:00
ramil/ram@myoffice.izhnet.ru
17828ea652
Merge mysql.com:/usr/home/ram/work/bug22723/my50-bug22723
...
into mysql.com:/usr/home/ram/work/bug22723/my51-bug22723
2006-10-31 13:10:06 +04:00
thek@kpdesk.mysql.com
12d8f2bf31
Bug#22828 _my_b_read() ignores return values for my_seek() calls
...
- Because my_seek actually is capable of returning an error code we should
exploit that in the best possible way.
- There might be kernel errors or other errors we can't predict and capturing
the return value of all system calls gives us better understanding of
possible errors.
2006-10-31 09:26:16 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
2d22e2ec84
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug23412/my41-bug23412
2006-10-31 10:21:18 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
261875bb03
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug23412/my50-bug23412
2006-10-31 10:18:48 +04:00
ramil/ram@myoffice.izhnet.ru
ca0087bd07
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug23412/my51-bug23412
2006-10-31 09:31:23 +04:00
ramil/ram@myoffice.izhnet.ru
d3d1c6a9b8
Merge mysql.com:/usr/home/ram/work/bug23412/my50-bug23412
...
into mysql.com:/usr/home/ram/work/bug23412/my51-bug23412
2006-10-31 09:15:51 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
ed95caceca
Merge mysql.com:/usr/home/ram/work/bug23412/my41-bug23412
...
into mysql.com:/usr/home/ram/work/bug23412/my50-bug23412
2006-10-31 08:53:29 +04:00
kroki/tomash@moonlight.intranet
75881599e5
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21915
2006-10-30 17:59:23 +03:00
kroki/tomash@moonlight.intranet
77f1d01fbb
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21915
2006-10-30 17:58:56 +03:00
kroki/tomash@moonlight.intranet
cf99db484e
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21915
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21915
2006-10-30 17:57:45 +03:00
kroki/tomash@moonlight.intranet
1c87434699
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21915
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21915
2006-10-30 17:51:36 +03:00