gbichot@production.mysql.com
2c297c0753
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into production.mysql.com:/usersnfs/gbichot/mysql-5.1-new
2006-03-14 09:00:45 +01:00
jimw@mysql.com
741b14a0ef
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-03-13 10:59:42 -08:00
gbichot@production.mysql.com
8a7a35fd3f
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into production.mysql.com:/usersnfs/gbichot/mysql-5.1-new
2006-03-13 19:59:27 +01:00
paul@snake-hub.snake.net
01d94fa5b5
mysqld.cc:
...
Revise option description. And let's put it in the proper
lexical order within the option list.
2006-03-13 11:58:36 -06:00
jimw@mysql.com
786abc60a9
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-03-13 08:31:39 -08:00
knielsen@mysql.com
39aa4776b3
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/tmpbuild-5.1
2006-03-13 16:35:01 +01:00
knielsen@mysql.com
140523a6f5
Fix compile problem (jump across initialization).
2006-03-13 16:32:45 +01:00
rburnett@production.mysql.com
a630375b32
post-commit:
...
Small change to enable sending of mails from Windows bk clones
2006-03-13 16:16:46 +01:00
knielsen@mysql.com
7f27d9824f
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2006-03-13 16:08:20 +01:00
knielsen@mysql.com
4d3ad1564d
Misc. portability compile fixes.
2006-03-13 16:07:00 +01:00
jonas@perch.ndb.mysql.com
fc8fdd2517
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-03-13 15:53:53 +01:00
guilhem@production.mysql.com
aa4de1c9f0
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into production.mysql.com:/usersnfs/gbichot/mysql-5.1-new
2006-03-13 15:45:57 +01:00
guilhem@mysql.com
e485f8e12c
Fixes to the replication mixed mode (patch approved by Monty):
...
- detect the need for row-based binlogging not at execution stage but earlier at parsing stage; needed for example for CREATE TABLE SELECT UUID().
- more tests of this mixed mode.
2006-03-13 15:34:30 +01:00
msvensson@shellback.(none)
6a9d3f78d9
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-13 15:24:40 +01:00
jimw@mysql.com
cf48e4cde6
Merge mysql.com:/home/jimw/my/mysql-5.1-17097
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-03-13 06:20:20 -08:00
jimw@mysql.com
d7762d4eb2
Merge mysql.com:/home/jimw/my/mysql-5.1-17497
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-03-13 06:18:04 -08:00
jimw@mysql.com
9e2bafbc5f
Merge mysql.com:/home/jimw/my/mysql-5.1-14526
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-03-13 06:15:21 -08:00
jimw@mysql.com
f9fa05a0c9
Merge mysql.com:/home/jimw/my/mysql-5.1-14673
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-03-13 06:12:42 -08:00
rburnett@production.mysql.com
b81dbad79b
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into production.mysql.com:/usersnfs/rburnett/mysql-5.1-bug17173
2006-03-13 14:54:39 +01:00
rburnett@production.mysql.com
c9472ee254
Bug # 17173 - Partitions: less than search fails
...
Bug # 17894 - Comparison with "less than" operator fails with range partition
The problem here was that on queries such as < 3, the range given is NULL < n < 3.
The null part works correctly where the null value is stored in rec[0] and the
field is marked as being null. However, when the 3 is processed, the 3 is places
on rec[0] but the null flag is left uncleared.
partition_range.result:
Results block for bug #17894
partition_range.test:
Test block for bug #17894
partition_list.result:
Results block for bug #17173
partition_list.test:
Test block for bug #17173
opt_range.cc:
call set_notnull to clear any null flag that may have been set
2006-03-13 14:50:16 +01:00
jonas@perch.ndb.mysql.com
95468faab3
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-13 14:49:15 +01:00
jonas@perch.ndb.mysql.com
0be6fc3d91
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-03-13 14:43:30 +01:00
jonas@perch.ndb.mysql.com
fa2263f4a6
bug#14028 -
...
ndb crash if trigger record get to big, fix incorrect max size of trigger record
2006-03-13 14:42:16 +01:00
jonas@perch.ndb.mysql.com
47fb7a3b6a
bug#14028 -
...
ndb crash if trigger record get to big, fix incorrect max size of trigger record
2006-03-13 14:38:12 +01:00
jimw@mysql.com
ed453f077f
Bug #17097 : Partitions: failing ADD PRIMARY KEY leads to temporary rotten metadata,crash
...
When doing an ALTER TABLE on a table using partitioning, force the table
definition to get reloaded, since it may become invalid whenever the ALTER
TABLE fails (even for an ALTER TABLE without specific partitioning changes).
2006-03-13 05:01:11 -08:00
jonas@perch.ndb.mysql.com
ce81e2b090
Merge perch.ndb.mysql.com:/home/jonas/src/51-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-13 13:49:37 +01:00
jonas@perch.ndb.mysql.com
ee7ffddf01
ndb - bug#18026
...
incorrect handling of varsize primary key and charsets in tup-scan
2006-03-13 13:37:42 +01:00
jonas@perch.ndb.mysql.com
4561b28df2
ndb - bug#16669
...
put nrtrace in out file instead (debug compiled..)
2006-03-13 12:29:43 +01:00
Reggie@xgeek.
d39e92049f
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into xgeek.:C:/work/mysql-5.1-new
2006-03-13 05:20:00 -06:00
Reggie@xgeek.
36121ee7ba
base:
...
Fixed problem where taocrypt was defined too early in the process
2006-03-13 05:17:23 -06:00
petr@mysql.com
f513420d12
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
2006-03-13 13:57:22 +03:00
msvensson@shellback.(none)
130985c2f6
Merge shellback.(none):/home/msvensson/mysql/init_rm/my51-init_rm
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-13 11:32:10 +01:00
msvensson@shellback.(none)
9afc40fccc
Remove also slave clusters data on restart after test failure
2006-03-13 11:30:16 +01:00
msvensson@shellback.(none)
59e7e3810d
Merge shellback.(none):/home/msvensson/mysql/init_rm/my50-init_rm
...
into shellback.(none):/home/msvensson/mysql/init_rm/my51-init_rm
2006-03-13 11:13:58 +01:00
msvensson@shellback.(none)
2628ebe89f
Remove printouts
2006-03-13 11:06:14 +01:00
msvensson@shellback.(none)
904e3ca2dc
Merge shellback.(none):/home/msvensson/mysql/init_rm/my50-init_rm
...
into shellback.(none):/home/msvensson/mysql/init_rm/my51-init_rm
2006-03-13 10:36:41 +01:00
msvensson@shellback.(none)
b32f1367fe
Make mysql-test-run.pl restore the db(s) to a known state before continuing after test case failure
2006-03-13 10:30:36 +01:00
jmiller@mysql.com
ce3dcff2f3
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-03-13 09:55:42 +01:00
tomas@poseidon.ndb.mysql.com
5a4e512942
changed test to make it predictable
2006-03-13 09:55:41 +01:00
jonas@perch.ndb.mysql.com
0d11c2c180
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/51-new
2006-03-13 09:36:39 +01:00
jonas@perch.ndb.mysql.com
4d436c320d
ndb - remove incorrect assertion
...
bug#17854, bug#18000
2006-03-13 09:19:24 +01:00
jmiller@mysql.com
92ce845796
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-03-13 09:05:26 +01:00
jmiller@mysql.com
43fb868e65
Test fix
2006-03-13 09:03:05 +01:00
petr@mysql.com
d91ea9e0cb
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
2006-03-13 10:27:03 +03:00
brian@zim.(none)
7128199563
Merge zim.(none):/home/brian/mysql/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.1-new
2006-03-12 06:49:03 -08:00
jonas@perch.ndb.mysql.com
45faa21a19
ndb -
...
Dont put object file in list of SOURCES...causing really weird make dist problem
2006-03-11 21:34:49 +01:00
jonas@perch.ndb.mysql.com
ec8ac0b3d7
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-03-11 19:39:56 +01:00
kent@mysql.com
b103fa3a21
dict0dict.h, dict0dict.c, ha_innodb.cc:
...
Make inline dict_table_is_comp() visible to ha_innodb.c as innodb_dict_table_is_comp()
2006-03-11 19:13:31 +01:00
jonas@perch.ndb.mysql.com
9effe54359
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-03-11 16:11:36 +01:00
tomas@poseidon.ndb.mysql.com
b9dcd3b154
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-11 15:55:19 +01:00