ingo@mysql.com
e22352b835
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-wl1563
2006-01-12 11:48:06 +01:00
jonas@perch.ndb.mysql.com
619ca4176b
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/51-new
2006-01-12 11:31:51 +01:00
jonas@perch.ndb.mysql.com
c505553bd9
ndb_dd_ddl - fix bug
2006-01-12 11:30:17 +01:00
mskold@mysql.com
388e28d575
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-01-12 11:27:54 +01:00
jonas@perch.ndb.mysql.com
6a0eac8418
ndb -
...
fix Suma get buffer ptr, adopt to new page pool in tup
2006-01-12 10:48:36 +01:00
pekka@mysql.com
f78e602895
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-01-12 10:36:05 +01:00
jonas@perch.ndb.mysql.com
c87e9032ef
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/51-new
2006-01-12 10:11:58 +01:00
bar@mysql.com
832148ded2
ctype_utf8.result:
...
After merge fix:
fixing order of results.
2006-01-12 13:08:49 +04:00
ingo@mysql.com
16437321cb
WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
...
NDB cluster is not fully supported. This will be added with
WL 1892 (NDB Handler: Add support for CREATE/DROP INDEX).
Some preparatory code for this is already present though.
A change for the "duplicate key" error message is planned
for another changeset.
2006-01-12 10:05:07 +01:00
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
knielsen@mysql.com
c1587a7546
Merge changeset 1.2031.1.1 06/01/11 16:18:11 reggie@linux.site into 5.1.5-alpha release clone
2006-01-12 09:18:34 +01:00
mskold@mysql.com
f5834451a8
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-01-12 09:14:00 +01:00
sergefp@mysql.com
aa00d65ead
Fix typo bug in previous cset
2006-01-12 11:11:16 +03:00
bar@mysql.com
77e9461f88
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.fscs3
2006-01-12 11:48:48 +04: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
28ed7c0c9f
sql_table.cc:
...
Typo fix.
Thanks Serg for noticing this.
2006-01-12 11:41:57 +04: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
fb7288c2a2
Fixed typo.
...
Really dumb typo....
2006-01-11 22:59:08 -08:00
brian@zim.tangent.org
19dbafc28c
Adding a --use-threads options which I believe will allow it to be ported to windows.
2006-01-11 21:30:52 -08: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
pekka@mysql.com
49932a62b5
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-01-12 05:16:23 +01:00
brian@zim.(none)
ee872b266a
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/archive-5.1
2006-01-11 19:16:56 -08:00
andrey@lmy004.
0a140a3752
delete the stale file and this should fix the build
...
after my push of WL#1034 (Internal CRON) into 5.1
2006-01-12 01:22:52 +01:00
anozdrin@mysql.com
00936e2777
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/MySQL/devel/5.0-bug15103
2006-01-12 03:05:29 +03:00
anozdrin@mysql.com
dae00c191f
Fix for BUG#15103: SHOW TRIGGERS: small output alignment problem.
2006-01-12 03:02:52 +03:00
pekka@mysql.com
7219ad013e
Merge mysql.com:/space/pekka/ndb/version/my51
...
into mysql.com:/space/pekka/ndb/version/my51-rbr
2006-01-12 00:17:11 +01:00
pekka@mysql.com
cf3a6863e4
ndb - wl#2972 (5.1, related) detached trigger fixes for multiops
2006-01-11 23:51:18 +01:00
reggie@linux.site
b03abd2888
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into linux.site:/home/reggie/work/mysql-5.0
2006-01-11 16:34:51 -06:00
reggie@linux.site
8de137a3aa
simple Windows compile fixes.
2006-01-11 16:18:11 -06: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
tomas@poseidon.ndb.mysql.com
25af1c1daf
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-01-11 19:50:58 +01:00
tomas@poseidon.ndb.mysql.com
0a0fe2b1c0
bug: replication of table spaces to work
...
bug: check if storage engine is enabled to avoif code dump
2006-01-11 19:49:38 +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
konstantin@mysql.com
4d272aba67
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-11 17:49:56 +03:00
konstantin@mysql.com
9105d06dd6
A fix for Bug#13944 "libmysqlclient exporting sha1_result function":
...
rename sha1_* to mysql_sha1_*
2006-01-11 17:31:52 +03:00
svoj@april.(none)
be55de4ff3
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into april.(none):/home/svoj/devel/mysql/warnings/mysql-5.1-new
2006-01-11 17:20:44 +04:00