Commit graph

31014 commits

Author SHA1 Message Date
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)
2c2d404fd7 Merge neptunus.(none):/home/msvensson/mysql/bug16333/my50-bug16333
into  neptunus.(none):/home/msvensson/mysql/bug16333/my51-bug16333
2006-02-16 10:08:02 +01:00
msvensson@neptunus.(none)
7d9eba0441 ndb_load disabled 2006-02-16 10:03:13 +01:00
jonas@perch.ndb.mysql.com
5283af4efe Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-16 09:12:45 +01:00
jonas@perch.ndb.mysql.com
6c809561fe Merge perch.ndb.mysql.com:/home/jonas/src/51-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-16 09:07:17 +01:00
jonas@perch.ndb.mysql.com
0e605ba313 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-02-16 09:05:58 +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
stewart@mysql.com
05696de46f Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug17411-thisisaverylongnamethatshouldbewaylongerthanthe128limitthatweprivouslyhadbutireallywantotestitandseethatitdoesreallywork.nowitshouldbeabout160charslongnonow.iwonderifanythingwillchokeornotwiththisoutrageouslylongpathname
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new
2006-02-16 15:51:37 +11:00
stewart@mysql.com
86332f4369 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug17411-thisisaverylongnamethatshouldbewaylongerthanthe128limitthatweprivouslyhadbutireallywantotestitandseethatitdoesreallywork.nowitshouldbeabout160charslongnonow.iwonderifanythingwillchokeornotwiththisoutrageouslylongpathname
2006-02-16 15:47:48 +11: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
tomas@poseidon.ndb.mysql.com
212d8c05e6 Bug #17415 special character tables are not handled correctly in ndb binlog/schema dist 2006-02-16 03:23:43 +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
andrey@lmy004.
00b188cc52 build fixes 2006-02-15 23:43:11 +01:00
andrey@lmy004.
a613782f96 more cosmetic before push of fix for bug#17289 2006-02-15 22:32:25 +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
andrey@lmy004.
46fcb188d0 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16410
2006-02-15 21:32:58 +01:00
andrey@lmy004.
c29fdc8844 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16410
2006-02-15 21:26:33 +01:00
serg@serg.mylan
1f07d78c2a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-02-15 21:25:31 +01:00
serg@serg.mylan
53d7570b9e Item_case_expr::type() cannot be called without fix_fields() :( 2006-02-15 21:22:53 +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
joerg@mysql.com
26ddd4fa45 config/ac-macros/ha_ndbcluster.m4 : Get back the message "Using NDB Cluster". 2006-02-15 21:04:42 +01: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
28a88a07ce Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 11:22:03 -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
msvensson@neptunus.(none)
12b23630db Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-15 20:16:33 +01:00
konstantin@mysql.com
99030e3f43 Fix the coding style in a few new files. 2006-02-15 21:08:44 +03: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
jimw@mysql.com
469cd9c610 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2006-02-15 09:29:11 -08:00
jimw@mysql.com
ce766cfc30 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2006-02-15 09:13:56 -08: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
serg@serg.mylan
94e3b91d4e fix 'make dist' 2006-02-15 17:26:22 +01:00
msvensson@devsrv-b.mysql.com
808ad6c738 Merge bk-internal:/home/bk/mysql-5.1-new
into  devsrv-b.mysql.com:/space/magnus/my51-bug17386
2006-02-15 17:21:26 +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.
a0fc7b89d6 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16410
2006-02-15 17:14:43 +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