jonas@perch.ndb.mysql.com
e48393d8ce
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-jonas
2006-04-10 14:06:06 +02:00
jonas@perch.ndb.mysql.com
e71dceedf1
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2006-04-10 14:04:15 +02:00
jonas@perch.ndb.mysql.com
75792db8ff
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-jonas
2006-04-10 14:03:00 +02:00
jonas@perch.ndb.mysql.com
e0f3118ab9
ndb - bug#17607
...
5.0->5.1 merge
2006-04-10 14:02:13 +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
msvensson@neptunus.(none)
24a6dd64b5
Update implementation of new function 'mysql_get_ssl_cipher' after review
2006-04-10 12:23:20 +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
brian@zim.(none)
ba5d08f340
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-04-09 20:07:42 -07:00
brian@zim.(none)
c33ace09b3
Disabling test, added bug #18928
2006-04-09 19:43:36 -07:00
aelkin@mysql.com
0316e7a05b
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
2006-04-09 23:47:11 +03:00
jonas@perch.ndb.mysql.com
da330a419c
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-04-09 22:17:55 +02:00
brian@zim.(none)
1d02038c1f
Disabled two broken test, created P1 showstoppers from them.
2006-04-09 11:57:25 -07:00
joerg@mysql.com
6dbb1edad8
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/M51/mysql-5.1
2006-04-09 19:17:26 +02:00
aelkin@mysql.com
5b6708e3ba
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
2006-04-09 19:38:59 +03:00
aelkin@mysql.com
95d1d4b5c3
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
2006-04-09 19:35:31 +03:00
jonas@perch.ndb.mysql.com
d2443da447
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-04-09 18:19:41 +02:00
aivanov@mysql.com
2d5dd11852
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/alexi/bugs/mysql-5.1-15758
2006-04-09 20:19:40 +04: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
aivanov@mysql.com
1488caeca6
Merge mysql.com:/home/alexi/bugs/mysql-5.0-15758-work
...
into mysql.com:/home/alexi/bugs/mysql-5.1-15758
2006-04-09 17:48:47 +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
jonas@perch.ndb.mysql.com
69d09a4a5b
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-04-09 09:36:59 +02:00
jonas@perch.ndb.mysql.com
263276c581
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-04-09 09:35:20 +02:00
knielsen@mysql.com
4d5ab7a961
$MYSQL_TEST was broken with --valgrind.
2006-04-08 22:27:43 +02: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
aelkin@mysql.com
9cc16ddb1e
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
2006-04-08 18:51:29 +03:00
jonas@perch.ndb.mysql.com
50e5752e27
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-04-08 16:35:07 +02:00
jonas@perch.ndb.mysql.com
965d6ac6bf
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2006-04-08 16:33:59 +02:00
joerg@mysql.com
208ae694bb
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/M51/mysql-5.1
2006-04-08 16:08:38 +02:00
aelkin@mysql.com
010a8a5728
#18906 : bushbuild reports rpl_temporary fails on solaris, AIX, QNX
...
Removing the problematic line from include test file.
2006-04-08 16:29:11 +03:00
aelkin@mysql.com
bac4263629
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
2006-04-08 15:31:47 +03:00
jonas@perch.ndb.mysql.com
64c8342f40
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-04-08 11:12:02 +02:00
jonas@perch.ndb.mysql.com
e5de83a62e
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-04-08 11:03:46 +02:00
ingo@mysql.com
26c4e82fee
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-aid
2006-04-08 10:48:33 +02:00
kent@mysql.com
91d28a6d36
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
2006-04-08 04:37:59 +02:00
kent@mysql.com
f957d8e282
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release.old03
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
2006-04-08 04:29:17 +02:00
igor@rurik.mysql.com
2e662287ce
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into rurik.mysql.com:/home/igor/mysql-5.1
2006-04-07 17:56:33 -07:00
ingo@mysql.com
ddf81838a7
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-aid
2006-04-07 23:39:01 +02:00
aelkin@dl145j.mysql.com
61377e953d
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145j.mysql.com:/tmp/5.0.21-bug17284-temp_table
2006-04-07 22:42:55 +02:00
serg@serg.mylan
5eefa6ec1f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-04-07 22:38:53 +02:00
serg@serg.mylan
c17d3a5148
plugin/fulltext/configure.in
...
no sense in building static library version of a plugin
plugin/fulltext/plugin_example.c
comments clarified. everything local to a plugin was declared static
2006-04-07 22:36:04 +02:00
igor@rurik.mysql.com
0d2e911204
Merge rurik.mysql.com:/home/igor/mysql-5.1
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-04-07 13:22:07 -07:00
igor@rurik.mysql.com
fb3b768205
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2006-04-07 13:07:40 -07:00
aivanov@mysql.com
612266ec90
Fixed BUG#15758: "Holding adaptive search latch in
...
innobase_query_caching_of_table_permitted()".
Applied the patch due to Heikki Tuuri.
Also removed superfluous #ifdefs.
2006-04-07 23:58:17 +04:00