mikael@dator5.(none)
e8d39758c7
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug19281
2006-06-20 10:08:30 -04:00
stewart@mysql.com
0d7ea0acd4
fix test result after BUG#20073 fix
2006-06-20 14:24:52 +10:00
anozdrin@booka.site
f237fa7840
Merge mysql.com:/home/alik/MySQL/devel/5.1-tree
...
into mysql.com:/home/alik/MySQL/devel/5.1-rt
2006-06-20 00:54:51 +04:00
evgen@sunlight.local
6e80c3ec42
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
2006-06-19 22:23:41 +04:00
evgen@moonbone.local
9c324f32e7
rpl_row_log.result, rpl_row_log_innodb.result:
...
Fixed failing test case
2006-06-19 20:21:00 +04:00
svoj@may.pils.ru
6124539b0f
Merge april:devel/BitKeeper/mysql-5.1-engines
...
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
2006-06-19 19:57:42 +05:00
anozdrin@mysql.com
3b6397b1d2
WL#3298: IM: make command-line option names consistent
...
1. Removed '-P' command line option;
2. Renamed '--passwd' command line option to '--print-password-line'.
2006-06-19 14:41:29 +04:00
evgen@moonbone.local
c0850425e5
rpl_log.test, rpl_stm_log.result:
...
Fixed failing test case
field.cc, item_cmpfunc.cc, select.result:
After merge fix
2006-06-19 04:26:27 +04:00
evgen@moonbone.local
79c91f6214
Manually merged
2006-06-18 14:56:35 +04:00
evgen@moonbone.local
09e84bf484
Merge moonbone.local:/work/tmp_merge-5.0
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-17 03:35:10 +04:00
evgen@moonbone.local
1aedd2ed3e
Manually merged
2006-06-17 02:57:50 +04:00
evgen@moonbone.local
59b204fe08
select.result:
...
After merge fix
2006-06-17 02:52:14 +04:00
evgen@moonbone.local
7f24667598
Manually merged
2006-06-17 02:11:12 +04:00
evgen@moonbone.local
592e080643
Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-17 01:57:25 +04:00
evgen@moonbone.local
28cf3c3e64
Manually merged
2006-06-17 00:58:36 +04:00
petr@outpost.site
86f2f5828d
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
2006-06-16 23:39:09 +04:00
ramil@mysql.com
f2899063ee
after-merge fixes.
2006-06-16 14:05:58 +05:00
stewart@mysql.com
45d7e75cb7
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
...
into mysql.com:/home/stewart/Documents/MySQL/5.1/main
2006-06-16 18:54:20 +10:00
igor@rurik.mysql.com
ee2e2d0c6d
Post_merges fixes.
2006-06-15 20:29:05 -07:00
igor@rurik.mysql.com
1241d86787
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-06-15 18:40:18 -07:00
igor@rurik.mysql.com
9b7ecb5553
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-06-15 18:36:46 -07:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
0273a29bf8
BUG#19281: Auto-increment disappeared after create index
2006-06-15 18:24:33 -04:00
petr@outpost.site
a3c4c13f3f
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
2006-06-16 01:50:31 +04:00
serg@serg.mylan
ce07f4b903
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into serg.mylan:/usr/home/serg/Abk/m51
2006-06-15 23:50:31 +02:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
5d2d3a53c9
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397
2006-06-15 17:50:30 -04:00
knielsen@mysql.com
061bdf919f
BUG#19940: Add Valgrind suppression for false alarm report.
2006-06-15 22:02:26 +02:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
c8da9ebda3
Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1
...
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397
2006-06-15 16:00:54 -04:00
evgen@moonbone.local
4dfd3af232
Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt
...
into moonbone.local:/work/18175-bug-5.0-opt
2006-06-15 22:10:47 +04:00
evgen@moonbone.local
0fb6b044e0
Fixed bug#18175: The nest_level counter wasn't decremented for union parts which
...
resulted in a wrong error message.
The nest_level counter indicates the depth of nesting for a subselect. It is
needed to properly resolve aggregate functions in nested subselects. Obviously
it shouldn't be incremented for UNION parts because they have the same level of
nesting. This counter was incremented by 1 in the mysql_new_select() function
for any new select and wasn't decremented for UNION parts. This resulted in
wrongly reported error messages.
Now the nest_level counter is decremented by 1 for any union part.
2006-06-15 22:09:58 +04:00
evgen@moonbone.local
d22c082b87
Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt
...
into moonbone.local:/work/16377-4.1-after
2006-06-15 16:41:26 +04:00
evgen@moonbone.local
2877b5ef64
item_cmpfunc.h, cast.result:
...
Post fix for bug#16377
2006-06-15 16:39:18 +04:00
ramil@mysql.com
c15a5a2b26
Merge mysql.com:/usr/home/ram/work/mysql-4.1
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2006-06-15 17:37:47 +05:00
gluh@eagle.intranet.mysql.r18.ru
00fcdf8c00
Fix for bug#19667 group by a decimal expression yields wrong result
2006-06-15 16:24:02 +05:00
evgen@moonbone.local
d3502181c0
Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt
...
into moonbone.local:/work/19789-bug-5.0-opt-mysql
2006-06-15 15:01:37 +04:00
evgen@moonbone.local
b669852866
Merge moonbone.local:/work/15351-bug-4.1-mysql
...
into moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt
2006-06-15 14:57:53 +04:00
petr@mysql.com
cde3d7d886
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
2006-06-15 14:53:11 +04:00
serg@serg.mylan
03a80df345
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into serg.mylan:/usr/home/serg/Abk/m51
2006-06-15 11:59:50 +02:00
ingo@mysql.com
2b6b5b6360
Merge mysql.com:/home/mydev/mysql-5.0-amerge
...
into mysql.com:/home/mydev/mysql-5.1-amerge
2006-06-15 10:58:02 +02:00
serg@serg.mylan
22bb0263d7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into serg.mylan:/usr/home/serg/Abk/m51
2006-06-15 08:27:50 +02:00
ramil@mysql.com
26fa98a2cb
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b15558
2006-06-15 11:15:56 +05:00
igor@rurik.mysql.com
88b0e989b6
Merge rurik.mysql.com:/home/igor/tmp_merge
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-06-14 20:00:36 -07:00
serg@serg.mylan
a2bb34ce8d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into serg.mylan:/usr/home/serg/Abk/m51
2006-06-15 04:37:21 +02:00
acurtis@ltamd64.xiphis.org
2b02a2aa2e
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into xiphis.org:/home/antony/work2/p2-bug20168.4
2006-06-14 19:37:21 -07:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
3e0cfd1ba1
merge fixes
2006-06-14 22:37:20 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
d02f358a11
Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1
...
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
2006-06-14 22:32:41 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
fea2fa6239
Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1
...
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
2006-06-14 19:41:33 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
67e6e8b423
merge update
2006-06-14 19:40:06 -04:00
evgen@moonbone.local
a2261d57be
Many files:
...
After merge fix
2006-06-15 01:48:41 +04:00
acurtis@xiphis.org
13ded6a6ca
Merge xiphis.org:/home/antony/work2/p2-bug20168.2
...
into xiphis.org:/home/antony/work2/p2-bug20168.4
2006-06-14 13:12:19 -07:00
tomas@poseidon.ndb.mysql.com
2746b73968
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2006-06-14 22:12:18 +02:00
