timour@mysql.com
0408f2bfc7
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-bug-17523
2006-03-01 16:43:56 +02:00
msvensson@shellback.(none)
ac8a25fb7d
Bug#17728 tests that fails are: ndb_gis rpl_ndb_multi_update2
...
- Run ndb_gis only if we have binlog_format_row
2006-03-01 15:41:28 +01:00
msvensson@shellback.(none)
371c986746
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-01 15:29:38 +01:00
tomas@poseidon.ndb.mysql.com
44e54ed1a9
Bug #16385 Partitions: crash when updating a range partitioned NDB table
...
Bug #17806 Update on NDB table with list partition causes mysqld to core
- modified complemented_pk_read to be complemented_read, and handle also hidden key
2006-03-01 15:24:46 +01:00
msvensson@shellback.(none)
b802826fc9
Dont' run the mysql_protocols on Windows
2006-03-01 15:22:47 +01:00
tomas@poseidon.ndb.mysql.com
df6bb1994b
Bug #17805 Cluster_replication database should be renamed to just cluster
2006-03-01 13:31:21 +01:00
holyfoot@deer.(none)
dc052a3a00
bug #9088 (bigint WHERE fails)
2006-03-01 15:50:15 +04:00
tomas@poseidon.ndb.mysql.com
70718ac25a
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-01 10:48:15 +01:00
bar@mysql.com
47b4f00720
Bug#16315 XML: extractvalue() handles self badly
...
xml.result, xml.test:
Adding test case.
item_xmlfunc.cc:
Adding a special function to handle "self" axis.
Previously "child" and "self" were handled the same.
2006-03-01 13:16:12 +04:00
msvensson@shellback.(none)
03d436d3fa
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-01 10:07:14 +01:00
tomas@poseidon.ndb.mysql.com
7c6ed2d681
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-01 09:57:36 +01:00
gluh@eagle.intranet.mysql.r18.ru
5d8956309c
Fix for bug#14363 Partitions: failure if create in stored procedure
...
store copy of partition function string
2006-03-01 12:42:33 +04:00
msvensson@neptunus.(none)
7d595d6488
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-01 09:33:34 +01:00
gluh@eagle.intranet.mysql.r18.ru
701110c943
Bug#16320 XML: extractvalue() won't accept names containing underscores
...
added '_' to allowed tag body symbols
2006-03-01 10:36:22 +04:00
andrey@lmy004.
e054588421
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug17494
2006-03-01 03:50:56 +01:00
andrey@lmy004.
fc6afaaef9
fix for bug #16426 , post fixes
2006-03-01 03:49:31 +01:00
kent@mysql.com
bc5c186828
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-01 03:18:59 +01:00
andrey@lmy004.
e38822d29b
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug17494
2006-03-01 02:36:15 +01:00
andrey@lmy004.
a9884c4c0a
fix for bug #16426
...
Events: Event-caused statements don't appear in the slow query log
WL#1034
2006-03-01 02:34:22 +01:00
paul@snake-hub.snake.net
21f0adc7c6
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 18:48:58 -06:00
paul@snake-hub.snake.net
591db4980d
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-28 18:12:29 -06:00
paul@snake-hub.snake.net
5ac33e8eb8
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 17:54:50 -06:00
paul@snake-hub.snake.net
7f7f5969c0
mysqltest.test:
...
Add real_sleep tests.
2006-02-28 17:54:11 -06:00
kent@mysql.com
5d722a8491
Merge
2006-02-28 23:29:58 +01:00
tomas@poseidon.ndb.mysql.com
5a46fbfbd8
Bug #17499 continued
...
- moved initialization of used_partitions
- more tests
+ removed reference to fixed bugs
2006-02-28 17:51:27 +01:00
jmiller@mysql.com
a8d76e59e5
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-28 16:13:43 +01:00
msvensson@shellback.(none)
7d1c5609a4
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-02-28 14:45:31 +01:00
andrey@lmy004.
d1056a7cd7
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16537
2006-02-28 14:45:25 +01:00
bar@mysql.com
3fb0e543c8
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.16313
2006-02-28 17:29:49 +04:00
msvensson@shellback.(none)
fe850cdc20
Merge 5.0 -> 5.1
2006-02-28 13:54:32 +01:00
msvensson@shellback.(none)
aac14ae4a1
Merge neptunus://home/msvensson/mysql/bug16795/my51-bug16795
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-02-28 13:04:48 +01:00
msvensson@neptunus.(none)
0c44abbb47
Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795
...
into neptunus.(none):/home/msvensson/mysql/bug16795/my51-bug16795
2006-02-28 13:03:26 +01:00
msvensson@shellback.(none)
916f763b9e
Merge neptunus:/home/msvensson/mysql/bug16795/my50-bug16795
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-02-28 13:03:00 +01:00
tomas@poseidon.ndb.mysql.com
4dee17f159
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-28 12:40:19 +01:00
tomas@poseidon.ndb.mysql.com
fecfbb4834
Bug#16385, Partitions: crash when updating a range partitioned NDB table
...
- too little space was allocated for receiving events, partition uses extra column in table
2006-02-28 12:28:52 +01:00
tomas@poseidon.ndb.mysql.com
9850332741
Bug #17763 mysqld cores with list partitioning if update to missing partition
...
- error string wrongly formatted
2006-02-28 12:27:53 +01:00
andrey@lmy004.
8fe55c09db
manual merge
2006-02-28 12:08:13 +01:00
andrey@lmy004.
483a6d06fa
fix for bug#16537 (Events: mysql.event.starts is null)
...
- now when the event is created and STARTS is omitted then STARTS is implicitly
CURRENT_TIMESTAMP
- This CS also fixed incorrect presentation of STARTS/ENDS in I_S.EVENTS
(incorporated review changes)
2006-02-28 11:43:10 +01:00
msvensson@shellback.(none)
a79c6b60d2
Merge neptunus:mysql/mysql-5.1
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-02-28 11:03:18 +01:00
msvensson@shellback.(none)
318bee862a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-02-28 11:00:35 +01:00
bar@mysql.com
bcc72ad04f
Bug#16313 XML: extractvalue() ignores '!' in names
...
xml.result, xml.test:
Adding test case.
item_xmlfunc.cc:
Fixed that the "!" character written at the end was ignored.
Now if we try to scan "!=", and if "!" is not
followed by "=", we rollback lex scanner back
to "!" token, so the parser will start to check
the next rule from the "!" character again.
Previously parser started from the next character,
which was EOF in the example in xml.test,
which led to query being successfully parsed,
instead of producing a syntax error.
2006-02-28 13:59:16 +04:00
msvensson@neptunus.(none)
2e401e202d
Merge msvensson@devsrv-b.mysql.com:/space/magnus/bug17279/my51-bug17279/
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-28 10:55:05 +01:00
msvensson@neptunus.(none)
7551c8d7f8
Merge msvensson@devsrv-b.mysql.com:/space/magnus/bug17279/my50-bug17279/
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-28 10:52:36 +01:00
msvensson@devsrv-b.mysql.com
ef8b5b47e8
Merge devsrv-b.mysql.com:/space/magnus/bug17279/my50-bug17279
...
into devsrv-b.mysql.com:/space/magnus/bug17279/my51-bug17279
2006-02-28 10:44:48 +01:00
SergeyV@selena.
2c8a6fadf9
Postfix for #17595 . few lines in a test were accidentally commented.
...
Comments removed.
2006-02-27 22:14:48 +03:00
dlenev@mysql.com
88a583da1d
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
...
into mysql.com:/home/dlenev/src/mysql-5.1-merges2
2006-02-27 20:38:45 +03:00
dlenev@mysql.com
db1ecaa1a2
Fix for trigger.test failures on pushbuild hosts introduced by fix for
...
bug #13525 "Rename table does not keep info of triggers".
Now we use MYSQLTEST_VARDIR in order to be able to run this test in different
vardir. Also improved cleanup after the test.
2006-02-27 20:32:32 +03:00
dlenev@mysql.com
8dbdf5237e
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
...
into mysql.com:/home/dlenev/src/mysql-5.1-merges2
2006-02-27 20:00:07 +03:00
dlenev@mysql.com
6137476427
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg13525
2006-02-27 20:00:05 +03:00
dlenev@mysql.com
6cb5c38c14
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg13525
2006-02-27 20:00:03 +03:00