tomas@whalegate.ndb.mysql.com
faaac96f98
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-12-11 20:59:24 +01:00
df@pippilotta.erinye.com
de716f1f86
No we're still at 5.0.54.
2007-12-11 17:38:49 +01:00
istruewing@stella.local
ba2d58ae5e
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-12-11 17:09:43 +01:00
tomas@whalegate.ndb.mysql.com
9a189642e7
remoce compiler warnings
2007-12-11 11:41:19 +01:00
hezx@hezx.(none)
a85e8a3f21
Merge hezx.(none):/media/hda5/work/mysql/bkroot/mysql-5.0-rpl
...
into hezx.(none):/media/hda5/work/mysql/bkwork/bug#30998/5.0
2007-12-11 17:34:37 +08:00
thek@adventure.(none)
7be4b6b5f4
Test fails because of non deterministric function: show grants for current_user()
2007-12-10 16:16:21 +01:00
thek@adventure.(none)
0f1665da3c
Merge adventure.(none):/home/thek/Development/cpp/bug27440/my50-bug27440
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-12-10 12:19:48 +01:00
df@pippilotta.erinye.com
a079cb9f49
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-release
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-12-10 12:02:02 +01:00
df@pippilotta.erinye.com
efd74cb680
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-12-10 10:52:05 +01:00
df@pippilotta.erinye.com
45c93a5866
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-12-10 10:42:58 +01:00
df@pippilotta.erinye.com
353cd3300a
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
2007-12-10 10:41:34 +01:00
tomas@whalegate.ndb.mysql.com
ddbb4d425c
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-12-10 10:31:51 +01:00
tomas@whalegate.ndb.mysql.com
ae7d4929e0
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-12-10 10:20:52 +01:00
igor@olga.mysql.com
0e3e5cf40d
Forced compilers to remove the warning appeared after the patch
...
with a fix for bug 32694.
2007-12-09 11:53:07 -08:00
igor@olga.mysql.com
f781e154e3
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug27545
2007-12-08 16:22:45 -08:00
igor@olga.mysql.com
be5485ce6d
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug32815
2007-12-08 14:47:56 -08:00
timour/tkatchaounov@lapi.mysql.com
9be915e743
Fix for BUG#32694 "NOT NULL table field in a subquery produces invalid results"
...
The problem was that when convert_constant_item is called for subqueries,
this happens when we already started executing the top-level query, and
the field argument of convert_constant_item pointed to a valid table row.
In turn convert_constant_item used the field buffer to compute the value
of its item argument. This copied the item's value into the field,
and made equalities with outer references always true.
The fix saves/restores the original field's value when it belongs to an
outer table.
2007-12-08 23:05:00 +02:00
igor@olga.mysql.com
c04d3727dc
Fixed bug #27545 .
...
Both arguments of the function NAME_CONST must be constant expressions.
This constraint is checked in the Item_name_const::fix_fields method.
Yet if the argument of the function was not a constant expression no
error message was reported. As a result the client hanged waiting for a
response.
Now the function Item_name_const::fix_fields reports an error message
when any of the additional context conditions imposed on the function
NAME_CONST is not satisfied.
2007-12-07 23:36:58 -08:00
igor@olga.mysql.com
c394dbe14a
Fixed bug #32815 .
...
The index (key_part_1, key_part-2) was erroneously considered as compatible
with the required ordering in the function test_test_if_order_by_key when
a query with an ORDER BY clause contained a condition of the form
key_part_1=const OR key_part_1 IS NULL
and the order list contained only key_part_2. This happened because the value
of the const_key_parts field in the KEYUSE structure was not formed correctly
for the keys that could be used for ref_or_null access.
This was fixed in the code of the update_ref_and_keys function.
The problem could not manifest itself for MyISAM databases because the
implementation of the keys_to_use_for_scanning() handler function always
returns an empty bitmap for the MyISAM engine.
2007-12-07 17:14:59 -08:00
tsmith@ramayana.hindu.god
4eb097ba12
Add a way to remove options which mysql-test-run.pl no longer uses.
2007-12-07 14:43:31 -07:00
thek@adventure.(none)
392cc185b3
Bug #27440 read_only allows create and drop database
...
When read_only option was enabled, a user without SUPER privilege could
perform CREATE DATABASE and DROP DATABASE operations.
This patch adds a check to make sure this isn't possible. It also attempts to
simplify the logic used to determine if relevant tables are updated,
making it more human readable.
2007-12-07 15:39:41 +01:00
mskold/marty@mysql.com/quadfish.(none)
4619caa5d5
Removed illegal cast
2007-12-07 14:03:54 +01:00
joerg@trift2.
fd5000f650
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-12-07 13:51:41 +01:00
mskold/marty@mysql.com/quadfish.(none)
6047fb2e44
Removed illegal cast
2007-12-07 13:42:44 +01:00
tsmith@ramayana.hindu.god
8c5f194505
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-12-07 03:51:23 -07:00
tsmith@ramayana.hindu.god
bf6292ea97
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-12-07 03:40:18 -07:00
tsmith@ramayana.hindu.god
6835272b37
Make tests more robust (clean up better after grant.test)
2007-12-07 03:39:37 -07:00
mskold/marty@mysql.com/quadfish.(none)
fc6f839b03
bug#21072 Duplicate key error in NDB references wrong key: Post-review fixes
2007-12-07 10:33:50 +01:00
tsmith@ramayana.hindu.god
b922c9646c
Fix compiler warning about wrong integer size (probably harmless)
2007-12-06 16:11:26 -07:00
tsmith@ramayana.hindu.god
44d74f631f
ctype-simple.c: Backport quick fix to remove Windows compiler warnings
2007-12-06 15:05:24 -07:00
mskold/marty@mysql.com/quadfish.(none)
27c025061d
bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts
2007-12-06 17:15:21 +01:00
tnurnberg@white.intern.koehntopp.de
987ec3f306
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/misc/mysql/31177/50-31177
2007-12-06 08:46:01 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
b1e77cfc31
Bug#31177: Server variables can't be set to their current values
...
additional fixes for BDB and correct assignment of both signed
and unsigned 64-bit data to unsigned system variables
2007-12-06 01:28:01 +01:00
tsmith@ramayana.hindu.god
f1323ad628
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-12-05 15:29:37 -07:00
bar@mysql.com/bar.myoffice.izhnet.ru
25debb1db6
sql_string.cc:
...
Fixing a wrong comment.
2007-12-05 12:26:21 +04:00
tsmith@ramayana.hindu.god
10cab933b2
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-12-04 20:58:21 -07:00
tsmith@ramayana.hindu.god
6453025165
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/41
2007-12-04 19:16:22 -07:00
mhansson@dl145s.mysql.com
22b4b4db04
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/mhansson/my50-bug30234
2007-12-04 11:32:11 +01:00
mhansson/martin@linux-st28.site
d2c6ed55ef
Bug#30234: Unexpected behavior using DELETE with AS and USING
...
Anti-patch. This patch undoes the previously pushed patch. It is
null-merged in versions 5.1 and above since there the original
patch is still desired.
2007-12-03 10:08:58 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
658f66e36e
Bug#31177: Server variables can't be set to their current values
...
additional fixes for 64-bit
2007-12-03 10:01:56 +01:00
hezx@hezx.(none)
c267a923a3
Bug#30998 Drop View breaks replication if view does not exist
...
When executing drop view statement on the master, the statement is written
into bin-log without checking for possible errors, so the statement would
always be bin-logged with error code cleared even if some error might occur,
for example, some of the views being dropped does not exist. This would cause
failure on the slave.
Writing bin-log after check for errors, if at least one view has been dropped
the query is bin-logged possible with an error.
2007-12-03 13:11:40 +08:00
kaa@polly.(none)
0e78354baa
Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-12-02 14:11:36 +03:00
kaa@polly.(none)
d905aade4f
Windows-specific fixes in floating point tests.
2007-12-02 13:49:12 +03:00
tnurnberg@white.intern.koehntopp.de
55d6d04df0
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/misc/mysql/31177/50-31177
2007-12-02 01:48:43 +01:00
kaa@polly.(none)
2a52bb82e4
Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-12-01 15:37:25 +03:00
kaa@polly.(none)
55acce7504
Fixed the floating point number tests on Windows.
2007-12-01 15:25:24 +03:00
tnurnberg@white.intern.koehntopp.de
3900e55aa8
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/misc/mysql/32707/50-32707
2007-12-01 13:09:16 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
d713527b0c
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into mysql.com:/misc/mysql/32707/41-32707
2007-12-01 13:07:27 +01:00
kaa@polly.(none)
0f0051e695
Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-12-01 12:57:20 +03:00
kaa@polly.(none)
33125cd40e
Fixed the build failure on Windows. It does not have trunc() defined in math.h, so we should not use it code.
2007-12-01 12:46:25 +03:00