evgen@moonbone.local
611f25f932
Merge
2006-02-16 21:11:38 +03:00
reggie@big_geek.
3ce0880d3f
Merge reggie@192.168.0.9:/home/reggie/work/mysql-5.1-bug15408
...
into big_geek.:C:/Work/mysql/mysql-5.1-bug15408
2006-02-16 11:07:21 -06:00
reggie@big_geek.
466a5bb399
BUG#15408: Partitions: subpartition names are not unique
...
Also, moved some of the code out of handler.h and into partition specific files for better
separation.
Also, moved some of the C funcs into partition_info as formal C++ methods
2006-02-16 10:38:33 -06:00
jimw@mysql.com
d30dbf6efa
Bug #17169 : Partitions: out of memory if add partition and unique.
...
When creating a new partition, a bogus memory allocation problem was
reported.
2006-02-16 08:15:36 -08:00
jmiller@mysql.com
b1a06e28a8
Test updates
2006-02-16 16:33:46 +01:00
andrey@lmy004.
4e4520b723
fix for bug#17543 Creating Event crash the server
...
this problem affects only debug builds
2006-02-16 16:11:02 +01:00
andrey@lmy004.
d89fc62e78
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16406
2006-02-16 14:53:36 +01:00
aivanov@mysql.com
09847849b9
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/alexi/dev/mysql-5.1-wl3148
2006-02-16 16:53:34 +03:00
aivanov@mysql.com
14633e0532
The patch adds PROCESSLIST information schema
2006-02-16 16:45:05 +03:00
jmiller@mysql.com
3cfcecbc4f
Updates from review
2006-02-16 14:24:47 +01:00
andrey@lmy004.
3c82af94e7
fix bug in show events which shows
...
| INTERVAL_VALUE | INTERVAL_FIELD |
| 20 | 20 MINUTE |
the second one should be without the value
2006-02-16 13:11:16 +01:00
msvensson@neptunus.(none)
0aa2580a42
Merge neptunus.(none):/home/msvensson/mysql/bug2845/my50-bug2845
...
into neptunus.(none):/home/msvensson/mysql/bug2845/my51-bug2845
2006-02-16 12:10:40 +01:00
msvensson@neptunus.(none)
8c828967ee
Bug#2845 client fails to reconnect if using TCP/IP
...
- Detect that connection to server has been broken in "net_clear". Since
net_clear is always called before we send command to server, we can be sure
that server has not received the command.
2006-02-16 12:02:38 +01:00
msvensson@neptunus.(none)
23c694a596
Merge msvensson@devsrv-b:/space/magnus/my51-bug17386
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-16 10:24:50 +01:00
msvensson@neptunus.(none)
6a2c609fa4
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-16 10:18:12 +01:00
ingo@mysql.com
cc538673ce
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug8841
2006-02-16 10:17:30 +01:00
mskold@mysql.com
ae586462b2
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb_improved_on-line_discover
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb_improved_on-line_discover
2006-02-16 10:15:44 +01:00
msvensson@neptunus.(none)
c00adf2028
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-16 10:09:53 +01:00
msvensson@neptunus.(none)
7d9eba0441
ndb_load disabled
2006-02-16 10:03:13 +01:00
ingo@mysql.com
65a4e27633
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug8841
2006-02-16 08:59:55 +01:00
ingo@mysql.com
233155e64e
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-16 07:01:15 +01:00
andrey@lmy004.
6354f2454d
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16406
2006-02-16 05:23:04 +01:00
andrey@lmy004.
7b2650a256
small post-merge fixes for bug#16406
...
(pre-push)
2006-02-16 05:21:02 +01:00
jmiller@mysql.com
b84ee0dec8
Test case updates and new test cases added to CRBR
2006-02-16 04:42:16 +01:00
tomas@poseidon.ndb.mysql.com
704562f696
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-16 03:24:55 +01:00
andrey@lmy004.
95e87f0811
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16406
2006-02-16 02:13:37 +01:00
jimw@mysql.com
6892c2a52a
Small post-merge fix to partition test
2006-02-15 17:01:31 -08:00
andrey@lmy004.
2158add8f0
merge
2006-02-16 01:27:36 +01:00
jmiller@mysql.com
20d12aa85b
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-16 01:06:16 +01:00
andrey@lmy004.
d3e0875759
fix for bug#16406 (Events: DROP DATABASE doesn't automatically drop events)
...
WL#1034
- This changeset also changes the executor so its quite more stable now.
Stressing test case added that executes ~800 events per second and dropping
hundreds of events at once using DROP DATABASE.
(with fixes after review of JimW)
(with fixes after review of Serg)
2006-02-16 00:43:11 +01:00
tomas@poseidon.ndb.mysql.com
cd8f8449e2
Bug #17414 ndb schema distribution functionality does not work on mysql servers without binlog
2006-02-16 00:30:56 +01:00
jimw@mysql.com
5e6b6c9935
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 15:08:20 -08:00
msvensson@neptunus.(none)
47257f1317
Bug#16795 ndb_cache_multi2
...
- remove timing dependent part of test, wait until condition occurs or sleep max 10 seconds
2006-02-15 22:46:16 +01:00
msvensson@neptunus.(none)
cac0931b8c
Add possibility to have a negative expression in "if" and "while" in mysqltest
2006-02-15 22:43:42 +01:00
jimw@mysql.com
95b45389cd
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 13:11:51 -08:00
ingo@mysql.com
e116d697bd
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-15 21:54:01 +01:00
andrey@lmy004.
189baa169b
merging before test + push
2006-02-15 21:51:57 +01:00
andrey@lmy004.
8193669f0a
cosmetic post-review changes
2006-02-15 21:40:38 +01:00
msvensson@neptunus.(none)
bb52ae8ca6
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-15 21:15:45 +01:00
jimw@mysql.com
d33b03abef
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 12:06:20 -08:00
jimw@mysql.com
9b333dd393
Merge mysql.com:/home/jimw/my/mysql-5.1-16782
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 11:39:54 -08:00
jimw@mysql.com
246a2a7f0c
Merge mysql.com:/home/jimw/my/mysql-5.1-16775
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 11:36:45 -08:00
jimw@mysql.com
e145908eb3
Bug #16782 : Partitions: crash, REPLACE .. on table with PK, DUPLICATE
...
KEY event. Partitioning wrongly claimed to be able to handle HA_DUPP_POS
when it was supported by the underlying storage engine, which resulted
in a crash when handling REPLACE statements.
2006-02-15 11:20:57 -08:00
andrey@lmy004.
dbb1589130
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug17289
2006-02-15 18:32:49 +01:00
evgen@moonbone.local
4d2b0fd026
Fix bug #15706 find_field_in_tables() returns field from outer select
...
If item->cached_table is set, find_field_in_tables() returns found field
even if it doesn't belong to current select. Because Item_field::fix_fields
doesn't expect such behaviour, reported bug occurs.
Item_field::fix_fields() was modifed to detect when find_field_in_tables()
can return field from outer select and process such fields accordingly.
In order to ease this code which was searching and processing outed fields was
moved into separate function called Item_field::fix_outer_field().
2006-02-15 19:45:06 +03:00
pem@mysql.com
f5035faf51
Additional tests for nested handlers added to sp.test.
...
A follow-up to BUG#15011 (already fixed).
2006-02-15 17:28:34 +01:00
msvensson@devsrv-b.mysql.com
65b455b593
Bug#17386 binlog interchangably contains engine= and type=
...
- Update result file and enable test
2006-02-15 17:19:40 +01:00
andrey@lmy004.
32ae54bdbc
fix for bug#16410 (Events: CREATE EVENT is legal in a CREATE TRIGGER statement)
...
WL#1034 (Internal CRON)
(post-post-review updates)
2006-02-15 17:12:27 +01:00
ingo@mysql.com
c75e407905
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-15 15:16:11 +01:00
brian@zim.tangent.org
3195aef714
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.tangent.org:/home/brian/mysql/archive-5.1
2006-02-15 06:16:10 -08:00