sergefp@mysql.com
40b7fab55d
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug16166-r2
2006-01-12 11:55:34 +03:00
sergefp@mysql.com
e40759e370
BUG#16166, "Can't use index_merge with FORCE INDEX": adjust the heurstics check to take into
...
account that "FORCE INDEX" disables full table scans, and not range/index_merge scans.
(with post-review fixes)
2006-01-12 10:48:27 +03:00
bar@mysql.com
0e9c8395c7
Merge mysql.com:/usr/home/bar/mysql-4.1.b15581
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-01-12 11:38:09 +04:00
bar@mysql.com
45c84d0aa9
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15581
2006-01-12 11:13:34 +04:00
brian@zim.tangent.org
c30f88f86d
Added bitfield support and a test for it.
...
Archive uses native row format, so honestly this is just the change in a flag.
2006-01-11 21:16:51 -08:00
anozdrin@mysql.com
dae00c191f
Fix for BUG#15103: SHOW TRIGGERS: small output alignment problem.
2006-01-12 03:02:52 +03:00
evgen@moonbone.local
41ef34356c
Fixed bug #15538 : unchecked table absence caused server crash.
...
Absence of table in left part of LEFT/RIGHT join wasn't checked before
name resolution which resulted in NULL dereferencing and server crash.
Modified rules:
"table_ref LEFT opt_outer JOIN_SYM table_ref" and "table_ref RIGHT opt_outer
JOIN_SYM table_ref"
NULL check is moved before push_new_name_resolution_context()
2006-01-11 23:39:09 +03:00
evgen@moonbone.local
3e23d458f9
Fixed bug #15347 : Wrong result of subselect when records cache and set
...
functions are involved.
When subselect is a join with set functions and no record have been found in
it, end_send_group() sets null_row for all tables in order aggregate functions
to calculate their values correctly. Normally this null_row flag is cleared for
each table in sub_select(), but flush_cached_records() doesn't do so.
Due to this all fields from the table processed by flush_cached_records() are
always evaluated as nulls and whole select produces wrong result.
flush_cached_records() now clears null_row flag at the very beginning.
2006-01-11 23:16:21 +03:00
brian@zim.(none)
605f3ab586
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/archive-5.1
2006-01-11 12:06:30 -08:00
evgen@moonbone.local
605f62fce8
Fixed bug #15633 : Evaluation of Item_equal for non-const table caused wrong
...
select result
Item equal objects are employed only at the optimize phase. Usually they are not
supposed to be evaluated. Yet in some cases we call the method val_int() for
them. Here we have to take care of restricting the predicate such an object
represents f1=f2= ...=fn to the projection of known fields fi1=...=fik.
Added a check for field's table being const in Item_equal::val_int().
If the field's table is not const val_int() just skips that field when
evaluating Item_equal.
2006-01-11 22:49:43 +03:00
jmiller@mysql.com
ed4c583d16
RBR test updates per lars request
2006-01-11 20:02:11 +01:00
andrey@lmy004.
b9de3d7f32
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-11 19:50:59 +01:00
andrey@lmy004.
a6d4732ccb
WL #1034
...
- add a bit more debug messages
- disable events.test for now due to a bug
2006-01-11 19:31:21 +01:00
jmiller@mysql.com
d228d61a5c
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-11 18:50:53 +01:00
jmiller@mysql.com
f95ebd12ba
Changes done from Jonas's review of pervious commit
2006-01-11 18:50:04 +01:00
brian@zim.(none)
bee896be2d
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/archive-5.1
2006-01-11 09:37:48 -08:00
andrey@lmy004.
50ca86f9d6
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-11 18:10:27 +01:00
andrey@lmy004.
71eb7d7ec9
WL #1034 (Internal CRON) pre-push updates
...
- various fixes of test cases
(hopefully the last pre-push update before the push)
2006-01-11 18:09:05 +01:00
jmiller@mysql.com
68ef8b07cd
Test clean up and moving over from old clone.
2006-01-11 17:06:14 +01:00
msvensson@devsrv-b.mysql.com
a8ce050acf
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into devsrv-b.mysql.com:/space/magnus/my51-wl2930_fixup
2006-01-11 16:16:50 +01:00
andrey@lmy004.
079237a90f
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-11 16:06:05 +01:00
mats@mysql.com
67a48b02bf
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/bkroot/mysql-5.1-new
2006-01-11 13:53:35 +01:00
msvensson@devsrv-b.mysql.com
7e97a12212
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into devsrv-b.mysql.com:/space/magnus/my51-wl2930_fixup
2006-01-11 13:03:09 +01:00
andrey@lmy004.
b7117c448e
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-11 12:51:17 +01:00
andrey@lmy004.
c326d96535
WL #1034 (Internal CRON) pre-push fixes
...
after another merge fixes.
2006-01-11 12:49:56 +01:00
gluh@mysql.com
f07d2aaac6
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-01-11 15:05:40 +04:00
gluh@eagle.intranet.mysql.r18.ru
9f729c45d7
Additional fix for wl#2506
2006-01-11 15:04:18 +04:00
andrey@lmy004.
8515610f2e
manual merge
2006-01-11 12:01:36 +01:00
mats@mysql.com
0933a3bc34
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b16095-mysql-5.1-new
2006-01-11 11:50:09 +01:00
jonas@perch.ndb.mysql.com
161645c81e
wl2723 - ndb opt. nr
2006-01-11 11:35:25 +01:00
msvensson@neptunus.(none)
4b913614fc
Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-11 11:24:57 +01:00
msvensson@neptunus.(none)
4bcc1845eb
Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
...
into neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup
2006-01-11 11:21:23 +01:00
msvensson@neptunus.(none)
2f48e4f1dc
Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero.
2006-01-11 11:06:26 +01:00
mats@mysql.com
31c3ae5603
Bug#16095 (INSERT DELAYED crashes mysqld server):
...
Checking that binlog is open before calling binlog_query().
2006-01-11 09:16:24 +01:00
brian@zim.(none)
b56432cd19
Added support for CREATE TABLE AUTO_INCREMENT and added more tests. Also non-unique index scans of autoincrement not function.
2006-01-10 22:54:34 -08:00
msvensson@neptunus.(none)
d42d399464
Disable code for "let" to assign each column from query to it's own variable
2006-01-11 00:24:57 +01:00
anozdrin@mysql.com
b04b851ef9
Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
...
There are two main idea of this fix:
- introduce a common function for server and client to split user value
(<user name>@<host name>) into user name and host name parts;
- dump DEFINER clause in correct format in mysqldump.
2006-01-11 02:07:40 +03:00
andrey@lmy004.
7c049782fa
WL #1034 (Internal CRON)
...
merge before push
2006-01-10 21:02:19 +01:00
andrey@lmy004.
d2f0002e77
WL #1034 (Internal CRON) pre-push updates
...
- fixed test results
- fixed bug caught by information_schema.test . Bison temporal
variables are very nice but extremely error-prone (Count one more
time just to be sure).
2006-01-10 19:16:58 +01:00
msvensson@neptunus.(none)
43d563b073
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 18:09:39 +01:00
aivanov@mysql.com
2871e85f2e
Merge mysql.com:/home/alexi/dev/mysql-4.1-15805
...
into mysql.com:/home/alexi/dev/mysql-5.0-15805
2006-01-10 19:22:47 +03:00
gluh@eagle.intranet.mysql.r18.ru
be4ebd9038
WL#2506: Information Schema tables for PARTITIONing
...
added I_S 'PARTITIONS' table
2006-01-10 19:44:04 +04:00
msvensson@neptunus.(none)
4a000ba857
Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-small_fix
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 16:00:37 +01:00
aivanov@mysql.com
16004acce1
Commenting out testcases which cause type_time.test failure.
...
To be uncommented after fixing bug 15805.
2006-01-10 17:57:46 +03:00
aelkin@mysql.com
9f0b5092e3
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
2006-01-10 14:40:05 +02:00
aelkin@mysql.com
d7eb02f439
BUG#9483 test was overworked to account reviews finally to leave only REVOKE check.
...
There is a specific rpl_ignore_grant test case for GRANT.
2006-01-10 13:44:08 +02:00
msvensson@neptunus.(none)
12fcc10533
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 11:42:20 +01:00
igor@rurik.mysql.com
19f3821ccb
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into rurik.mysql.com:/home/igor/mysql-5.1
2006-01-10 02:19:01 -08:00
msvensson@neptunus.(none)
86e8958a4e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
2006-01-10 09:57:59 +01:00
msvensson@neptunus.(none)
d37c04d125
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/bug15598/my51-bug15598
2006-01-10 09:20:30 +01:00