andrey@lmy004.
780d634496
fix for bug#16537
...
(post-review pre-push changes)
coding style (mostly trailing spaces removed)
2006-02-28 14:43:49 +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
tomas@poseidon.ndb.mysql.com
47cb191a79
Bug #17499 Alter table of ndb partitioned tables causes mysqld to core
...
- moved used_partitions initialization
2006-02-28 14:29:48 +01:00
tomas@poseidon.ndb.mysql.com
a9ad4c2e6f
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 14:18:59 +01:00
tomas@poseidon.ndb.mysql.com
0cff2df315
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 14:02:16 +01:00
msvensson@shellback.(none)
fe850cdc20
Merge 5.0 -> 5.1
2006-02-28 13:54:32 +01:00
knielsen@mysql.com
deebd0ef3b
Windows compile fixes.
2006-02-28 13:21:35 +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
msvensson@shellback.(none)
83ef0486b7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-02-28 13:00:23 +01:00
knielsen@mysql.com
19c4ba39c4
Windows compile fixes.
2006-02-28 12:52:38 +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
81479bde6a
Bug #17701 , ALTER TABLE t1 ADD PARTITION for PARTITION BY LIST hangs test
...
- code wrongly tries to do a "fast alter partition", although not supported
2006-02-28 12:29:50 +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
knielsen@mysql.com
70d9cd1b74
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new
2006-02-28 11:30:27 +01:00
msvensson@shellback.(none)
59af694195
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-02-28 11:10:39 +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)
359b2ef4dc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-02-28 11:00:47 +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
gluh@eagle.intranet.mysql.r18.ru
4858032176
Fix for bug#17602 Server crash on AVG/SUM over DECIMAL column(2nd ver)
...
The table may be corrupted and decimal columns may have invalid values in this case.
To prevent crash we need to check that decimal column has allowable value.
In case of invalid value generate warning and set the value to 0.
2006-02-28 13:36:41 +04:00
gluh@eagle.intranet.mysql.r18.ru
149ecabb50
bug#17568 mysql_fix_privilege_tables doesn't create mysql.plugin
...
'mysql_install_db' changed to 'mysql_upgrade' in error message
2006-02-28 12:42:06 +04:00
holyfoot@deer.(none)
91d09f4635
Fixed crashes in embedded-server tests
2006-02-28 12:21:56 +04:00
kent@mysql.com
0196184bb9
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
2006-02-28 05:40:48 +01:00
brian@zim.(none)
d49995d16e
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-02-27 13:28:59 -08:00
brian@zim.(none)
23e384fc3e
another cleanup patch for removing tables before tests start.
2006-02-27 13:27:25 -08:00
lars@mysql.com
616a47cc6d
BUG#17752: Non-allocated memory caused core in rpl_multi_engine test
2006-02-27 22:14:46 +01:00
lars@mysql.com
05d1921181
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-bug13418
2006-02-27 19:26:31 +01: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
lars@mysql.com
2ebe57777f
BUG#13418: Virtualized some functions so that Bit_field class will use correct cmp functions
2006-02-27 18:34:04 +01: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
c09d27c94d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/dlenev/src/mysql-5.1-merges2
2006-02-27 20:11:54 +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
3d6839d133
Fixed test results after bad auto-merge.
2006-02-27 20:00:06 +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
SergeyV@selena.
763475754a
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into selena.:H:/MYSQL/src/#15943-mysql-5.0
2006-02-27 20:00:03 +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
sergefp@mysql.com
db54dc36f5
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug17314-push
2006-02-27 20:00:02 +03:00
tomas@poseidon.ndb.mysql.com
d3371b996f
BUG#17499, forgot to commit result file
2006-02-27 17:24:06 +01:00
mats@mysql.com
f0f8795beb
Post-merge fixes.
2006-02-27 17:23:20 +01:00
tomas@poseidon.ndb.mysql.com
bfc43d5745
Bug #17499 Alter table of ndb partitioned tables causes mysqld to core
2006-02-27 17:04:49 +01:00
msvensson@neptunus.(none)
e2423d5e05
BUG#2845 client fails to reconnect if using TCP/IP
...
- Use 'poll' if available
- Check that sd <= FD_SETSIZE if using 'select'
- Handle case when 'net_data_is_ready' returns -1, ie. sd > FD_SETSIZE and 'select' is used
2006-02-27 16:44:23 +01:00
msvensson@devsrv-b.mysql.com
706070fbf8
Bug#17279 user with no global privs and with create priv in db can create databases
...
- Use binary charset in acl_cache, to make searches case sensitive
- Add testcase
2006-02-27 16:41:58 +01:00