gkodinov@dl145s.mysql.com
b0167d265f
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-28 10:36:04 +02:00
gkodinov@dl145s.mysql.com
55cc4fd5c6
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
2006-09-28 10:19:25 +02:00
istruewing@chilla.local
629076c5b3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug20719-m
2006-09-28 08:55:01 +02:00
gluh@mysql.com/gluh.(none)
4aaf7e34ff
additional 'after merge' fix
2006-09-27 20:11:11 +05:00
gluh@mysql.com/gluh.(none)
c3d63bef2b
after merge fix
2006-09-27 19:21:29 +05:00
svoj@mysql.com/april.(none)
b724a03e08
After merge fix.
2006-09-27 18:33:31 +05:00
gluh@mysql.com/gluh.(none)
437c94317b
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-09-27 18:06:46 +05:00
gluh@mysql.com/gluh.(none)
a039376c43
Patch for bug#21432 is reverted
2006-09-27 17:49:16 +05:00
svoj@mysql.com/april.(none)
bfb6ff6bdd
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-09-27 15:42:00 +05:00
svoj@mysql.com/april.(none)
a324cb8934
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2006-09-27 15:34:52 +05:00
istruewing@chilla.local
cab5981250
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into chilla.local:/home/mydev/mysql-4.0-bug20719
2006-09-27 12:29:12 +02:00
svoj@mysql.com/april.(none)
c41bd4461b
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-09-27 15:25:00 +05:00
istruewing@chilla.local
fdc6500965
Merge chilla.local:/home/mydev/mysql-4.1-bug20719-m
...
into chilla.local:/home/mydev/mysql-5.0-bug20719-m
2006-09-27 12:03:49 +02:00
istruewing@chilla.local
ac778232cd
Bug#20719 - Reading dynamic records with write buffer could fail
...
After merge fix.
2006-09-27 11:55:30 +02:00
gkodinov/kgeorge@macbook.gmz
903387afc0
Bug #21174 : Index degrades sort performance and optimizer does not honor IGNORE INDEX
...
- reversed the patch for 5.0 and moved to 5.1
2006-09-27 12:53:53 +03:00
istruewing@chilla.local
6ff6d80e57
Merge chilla.local:/home/mydev/mysql-4.1-bug20719
...
into chilla.local:/home/mydev/mysql-4.1-bug20719-m
2006-09-27 09:30:54 +02:00
holyfoot/hf@mysql.com/deer.(none)
542cdbbc42
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/mysql-5.0-mrg
2006-09-27 11:46:02 +05:00
holyfoot/hf@mysql.com/deer.(none)
4716c99a17
Merge bk@192.168.21.1:mysql-4.1-opt
...
into mysql.com:/home/hf/work/mysql-4.1.15428
2006-09-27 11:44:05 +05:00
joerg@trift2.
3799f32f76
Merge trift2.:/MySQL/M50/clone-5.0
...
into trift2.:/MySQL/M50/push-5.0
2006-09-26 12:00:18 +02:00
igor@rurik.mysql.com
df1376a542
Merge rurik.mysql.com:/home/igor/mysql-5.0-opt
...
into rurik.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug21646
2006-09-25 07:40:54 -07:00
igor@rurik.mysql.com
c0569012d0
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-09-25 06:46:15 -07:00
igor@rurik.mysql.com
a661bdda19
Fixed bug #21646 .
...
Presence of a subquery in the ON expression of a join
should not block merging the view that contains this join.
Before this patch the such views were converted into
into temporary table views.
2006-09-25 06:15:14 -07:00
igor@rurik.mysql.com
55dd569bab
Fixed bug #21853 : assert failure for a grouping query with
...
an ALL/ANY quantified subquery in HAVING.
The Item::split_sum_func2 method should not create Item_ref
for objects of any class derived from Item_subselect.
2006-09-25 05:24:07 -07:00
holyfoot/hf@mysql.com/deer.(none)
f8eeebbc4c
Merge mysql.com:/home/hf/work/mysql-4.1.15428
...
into mysql.com:/home/hf/work/mysql-5.0-mrg
2006-09-25 16:44:53 +05:00
holyfoot/hf@mysql.com/deer.(none)
14b16d89d9
Merge mysql.com:/home/hf/work/mysql-4.1.12991
...
into mysql.com:/home/hf/work/mysql-4.1.15428
2006-09-25 16:35:57 +05:00
holyfoot/hf@mysql.com/deer.(none)
4a9cff00c5
Merge bk@192.168.21.1:mysql-4.1-opt
...
into mysql.com:/home/hf/work/mysql-4.1.15428
2006-09-25 16:33:51 +05:00
kent@mysql.com/c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
bf29b9db98
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2006-09-25 01:32:55 +02:00
kent@mysql.com/c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
878416e054
mysql_config.sh:
...
Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
Filter out icc specific options from cflags/libs(_r)
2006-09-25 00:54:46 +02:00
istruewing@chilla.local
f1db460851
Merge chilla.local:/home/mydev/mysql-4.1-bug14400-monty
...
into chilla.local:/home/mydev/mysql-5.0-bug14400-monty
2006-09-23 13:25:45 +02:00
istruewing@chilla.local
af6b36e818
Merge chilla.local:/home/mydev/mysql-4.0-bug14400
...
into chilla.local:/home/mydev/mysql-4.1-bug14400-monty
2006-09-23 11:24:47 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
7a761a2545
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-23 07:37:41 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
7ce96bb579
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-23 07:12:00 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
80dadacb03
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-23 07:11:32 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
bbf84d6b9e
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-23 06:00:50 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
7e45d80362
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-23 05:58:48 +02:00
istruewing@chilla.local
2b121cd0e1
Bug#14400 - Query joins wrong rows from table which is subject of
...
"concurrent insert"
After merge fix.
2006-09-22 17:23:25 +02:00
istruewing@chilla.local
9d0cedffad
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into chilla.local:/home/mydev/mysql-4.0-bug14400
2006-09-22 15:06:01 +02:00
istruewing@chilla.local
bb2a7fec48
Merge chilla.local:/home/mydev/mysql-4.0--team
...
into chilla.local:/home/mydev/mysql-4.0-bug14400
2006-09-22 15:03:50 +02:00
georg@lmy002.wdf.sap.corp
67a701003c
Fix for bug #19121 : Windows incompatible udf_example
2006-09-22 14:42:43 +02:00
georg@lmy002.wdf.sap.corp
ca00ba4991
Added build rule for mysql_upgrade.exe
2006-09-22 07:38:24 +02:00
joerg@trift2.
17218bd732
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2006-09-21 20:03:39 +02:00
joerg@trift2.
d1f0a57a6d
Add a dummy file for "Docs/manual.chm" as we need it for "make dist" to work.
2006-09-21 17:38:42 +02:00
istruewing@chilla.local
64fbabc551
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-toteam
2006-09-21 17:18:20 +02:00
joerg@trift2.
3acb6778dd
Merge trift2.:/MySQL/M50/extract1-5.0
...
into trift2.:/MySQL/M50/push-5.0
2006-09-21 16:48:31 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
738cd74b52
After merge fixes
2006-09-21 13:38:01 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
2c5dc57e27
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-21 13:28:16 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
9538acf5dc
Adding proper setup phase for test case rpl_insert_id
2006-09-21 13:19:52 +02:00
istruewing@chilla.local
f083782c42
Merge chilla.local:/home/mydev/mysql-5.0--main
...
into chilla.local:/home/mydev/mysql-5.0-toteam
2006-09-21 10:55:23 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
fe782f92d6
Vertical printout in test to make easier to read
2006-09-21 03:32:42 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
95d0ae96b2
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-21 01:01:38 +02:00