ingo@mysql.com
2ef6034165
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug5390
2006-04-11 15:18:16 +02:00
ramil@mysql.com
094c4290ca
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b14360
2006-04-11 18:14:34 +05:00
bell@sanja.is.com.ua
b4980d4383
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2006-04-11 14:49:33 +03:00
ramil@mysql.com
1e29244200
Fix for bug #14360 : Date Between Interval Broken.
2006-04-11 16:13:57 +05:00
joerg@mysql.com
92d7ae0580
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2006-04-11 13:07:58 +02:00
ingo@mysql.com
fff2bc4d46
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug5390
2006-04-11 12:41:26 +02:00
ramil@mysql.com
32cabaa39f
after merge fix.
2006-04-11 15:26:18 +05:00
pem@mysql.com
57107fc975
Fixed BUG#18787: Server crashed when calling a stored procedure containing
...
a misnamed function
... in the presence of a continue handler. The problem was that with a
handler, it continued to execute as if function existed and had set a
useful return value (which it hadn't).
The fix is to set a null return value and do an error return when a function
wasn't found.
2006-04-11 12:17:57 +02:00
ramil@mysql.com
a2cd8beb96
Merge mysql.com:/usr/home/ram/work/mysql-4.0
...
into mysql.com:/usr/home/ram/work/mysql-4.1
2006-04-11 13:53:44 +05:00
msvensson@neptunus.(none)
abf41982f8
Add surrounding braces, move invalidate dictionary_cace to after declaration of variable "table_list"
2006-04-11 09:46:03 +02:00
msvensson@neptunus.(none)
875154606e
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-04-11 09:09:21 +02:00
bell@sanja.is.com.ua
11f59e3930
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2006-04-11 10:03:53 +03:00
ingo@mysql.com
22431de4e0
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug5390
2006-04-11 08:46:48 +02:00
ramil@mysql.com
4791ce7942
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/usr/home/ram/work/mysql-4.0
2006-04-11 10:46:21 +05:00
jimw@mysql.com
0647a26ade
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-10 16:17:46 -07:00
jimw@mysql.com
a159a55c2c
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-10 14:30:00 -07:00
igor@rurik.mysql.com
e2feeb88f9
Made the test case for bug #15917 independent on platforms.
2006-04-10 14:14:20 -07:00
igor@rurik.mysql.com
406b29b6e0
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-10 13:04:25 -07:00
bell@sanja.is.com.ua
ff698513e5
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2006-04-10 22:00:03 +03:00
bell@sanja.is.com.ua
5fe95af804
Avoid trying to include <asm/atomic.h> when it doesn't work in C++
...
code. (Bug #13621 )
2006-04-10 21:57:29 +03:00
joerg@mysql.com
34a90d3016
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2006-04-10 20:48:10 +02:00
ingo@mysql.com
5824ec03e1
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug5390
2006-04-10 20:48:10 +02:00
knielsen@mysql.com
030c170550
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/mysql/mysql-5.0-tmp
2006-04-10 20:48:09 +02:00
aivanov@mysql.com
31727db005
Merge mysql.com:/home/alexi/bugs/mysql-5.0-15868
...
into mysql.com:/home/alexi/bugs/mysql-5.0-15868-work
2006-04-10 22:48:08 +04:00
aivanov@mysql.com
6ad6cda2ca
Fixed test case result (after BUG#15868 fix).
2006-04-10 22:44:01 +04:00
jimw@mysql.com
fec9005e87
Merge mysql.com:/home/jimw/my/mysql-5.0-13601
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-10 11:23:30 -07:00
knielsen@mysql.com
4088329ba0
Merge mysql.com:/usr/local/mysql/mysql-5.0-fixcast
...
into mysql.com:/usr/local/mysql/mysql-5.0-tmp
2006-04-10 17:58:22 +02:00
ingo@mysql.com
1c0f675377
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug5390
2006-04-10 17:58:21 +02:00
knielsen@mysql.com
1f9d96430d
Merge mysql.com:/usr/local/mysql/mysql-4.1-vgfix
...
into mysql.com:/usr/local/mysql/mysql-5.0-tmp
2006-04-10 17:58:21 +02:00
aivanov@mysql.com
aeeb19920d
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/bugs/mysql-5.0-15868
2006-04-10 19:58:20 +04:00
aivanov@mysql.com
bb94bb30d0
Fixed BUG#15868: InnoDB hangs under 200 threads making INSERTs: 'thread thrashing'.
...
Applied changes due Heikki Tuuri.
2006-04-10 19:47:41 +04:00
msvensson@neptunus.(none)
6b1f72c1a7
Merge 192.168.0.20:mysql/bug15069/my50-bug15069
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-04-10 15:13:30 +02:00
msvensson@shellback.(none)
475e1f6a53
Bug#15069 [patch] my_print_defaults does'nt care --sysconfdir
...
- Grab the path from "configure --sysconfdir=<path>" and set it as
the first place to look for my.cnf files
Do this both in Makefiles for libmysql and mysys
- Patch provided by Francesco Riosa. Thank you!
2006-04-10 15:11:37 +02:00
jonas@perch.ndb.mysql.com
a60dfde3fd
ndb - bug#17607
...
4.1->5.0 merge
2006-04-10 13:51:43 +02:00
jonas@perch.ndb.mysql.com
71053ded99
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-04-10 13:48:26 +02:00
jonas@perch.ndb.mysql.com
14fa759b5d
ndb - bug#17607
...
fix correct frag count in Backup block
2006-04-10 13:45:33 +02:00
knielsen@mysql.com
587627b1fc
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/mysql/mysql-4.1
2006-04-10 13:05:35 +02:00
jonas@perch.ndb.mysql.com
775527103d
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-04-10 10:30:27 +02:00
jonas@perch.ndb.mysql.com
e4e61b091a
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-04-10 09:56:57 +02:00
knielsen@mysql.com
b9d427ca27
Fix test case 'cast' on Windows, different floating point output format.
2006-04-10 09:31:46 +02:00
jonas@perch.ndb.mysql.com
7e0733fedc
Merge perch.ndb.mysql.com:/home/jonas/src/50-jonas
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-04-10 08:29:24 +02:00
jonas@perch.ndb.mysql.com
5b38711760
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-04-10 08:27:59 +02:00
aelkin@dl145k.mysql.com
f5c527972f
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145k.mysql.com:/tmp/andrei/5.0.21-bug17284-temp_table
2006-04-09 18:14:30 +02:00
aivanov@mysql.com
61c7e4bac5
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/bugs/mysql-5.0-15758
2006-04-09 20:14:29 +04:00
aelkin@mysql.com
cbee6eca95
BUG#18906 Test case rpl_temporary fails when using --vardir option
...
env variable name is fixed.
2006-04-09 13:27:53 +03:00
lars@mysql.com
ab71e2ac99
Merge mysql.com:/users/lthalmann/bk/mysql-5.0-release-bug18116
...
into mysql.com:/users/lthalmann/bk/mysql-5.0
2006-04-09 10:40:52 +02:00
knielsen@mysql.com
32940fc3cb
Merge mysql.com:/usr/local/mysql/mysql-4.1-vgfix
...
into mysql.com:/usr/local/mysql/mysql-4.1
2006-04-09 00:22:05 +02:00
knielsen@mysql.com
4d5ab7a961
$MYSQL_TEST was broken with --valgrind.
2006-04-08 22:27:43 +02:00
bell@sanja.is.com.ua
ba424aacb0
Check tinfo library presence and use it. (BUG#18912)
2006-04-08 23:19:52 +03:00
igor@rurik.mysql.com
17141582d4
Fixed bug #16069 .
...
The function agg_cmp_type in item_cmpfunc.cc neglected the fact that
the first argument in a BETWEEN/IN predicate could be a field of a view.
As a result in the case when the retrieved table was hidden by a view
over it and the arguments in the BETWEEN/IN predicates are of
the date/time type the function did not perform conversion of
the constant arguments to the same format as the first field argument.
If formats of the arguments differed it caused wrong a evaluation of
the predicates.
2006-04-08 11:42:09 -07:00