msvensson@neptunus.(none)
13161c2a84
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-28 15:32:05 +02:00
msvensson@neptunus.(none)
324f4be3d4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-09-28 13:45:42 +02:00
kent@mysql.com
99ce6f0b76
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-09-28 13:37:58 +02:00
kent@mysql.com
07a9052bce
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-09-28 13:23:57 +02:00
jan@hundin.mysql.fi
dc80450410
Fixed a bug checksum table locks the InnoDB table and does not use a
...
consistent read (Bug #12669 ).
2005-09-28 14:14:49 +03:00
msvensson@neptunus.(none)
fbf4a5e079
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-28 11:34:53 +02:00
patg@krsna.patg.net
acdc193a45
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-5.0
2005-09-27 15:04:26 -07:00
evgen@moonbone.local
4f4711bd49
Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items.
...
resolve_const_item() assumed to be not called for Item_row items. For
ensuring that DBUG_ASSERT(0) was set there.
This patch adds section for Item_row items. If it can it recursively calls
resolve_const_item() for each item the Item_row contains. If any of the
contained items is null then whole Item_row substitued by Item_null. Otherwise
it just returns.
2005-09-28 00:58:12 +04:00
msvensson@neptunus.(none)
1105d4293d
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/fix_mysqltest/my41-fix_mysqltest
2005-09-27 16:48:41 +02:00
igor@rurik.mysql.com
6e2fb27af6
item.cc:
...
Fixed bug #13410 .
Fixed name resolution for qualified reference to a view column
in the HAVING clause.
view.result, view.test:
Added a test case for bug #13410 .
2005-09-26 23:29:02 -07:00
patg@krsna.patg.net
8864a9b3c4
BUG #7815
...
Changes per serg to http://lists.mysql.com/internals/30281
Re-enabled --delayed-insert
2005-09-26 22:43:09 -07:00
igor@rurik.mysql.com
75c43f9663
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2005-09-26 20:28:49 -07:00
igor@rurik.mysql.com
a43b341c8a
sql_base.cc, item.cc:
...
Fixed bug #13411 .
Fixed name resolution for non-qualified reference to a view column
in the HAVING clause.
view.result, view.test:
Added a test case for bug #13411 .
2005-09-26 20:18:59 -07:00
pem@mysql.com
6ac4c47f7b
Fixed BUG#6127: Stored procedure handlers within handlers don't work
...
Replaced the dumb in-handler/not-in-handler check with a proper recursion
check of handlers being executed.
(Re-commit in a different tree, to make push possible.)
2005-09-26 18:22:00 +02:00
evgen@moonbone.local
0061782cd0
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/13424-bug-5.0-mysql
2005-09-26 19:45:05 +04:00
evgen@moonbone.local
0032165acf
Fix bug #13424 locking view with query cache enabled crashes server
...
For LOCK view is opened but not prepared thus leaving 'table' field set to
NULL. invalidate_locked_for_write() wasn't checking that and call to
invalidate_table(NULL) crashes server.
To invalidate_locked_for_write() added check that ensures that table is
completely opened.
2005-09-26 19:08:26 +04:00
ingo@mysql.com
2ebea0d31b
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-09-26 13:13:29 +02:00
hf@deer.(none)
953848b855
Merging
2005-09-26 14:17:30 +05:00
hf@deer.(none)
6890eae9e5
Merging
2005-09-26 13:15:01 +05:00
ingo@mysql.com
6c70281789
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-09-26 09:56:18 +02:00
ingo@mysql.com
f8203e8765
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-09-26 09:18:31 +02:00
serg@serg.mylan
4b24f83f8f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-25 16:07:13 +02:00
ingo@mysql.com
95fa3340c6
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-09-25 15:51:28 +02:00
serg@serg.mylan
86ad035270
test case fixed to pass w/o innodb
2005-09-25 15:44:05 +02:00
kent@mysql.com
44305ca26c
disabled.def:
...
Disable unstable test cases
new file
2005-09-25 11:35:32 +02:00
sergefp@mysql.com
2294c9b57a
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug13317
2005-09-25 01:36:26 +04:00
kent@mysql.com
4e289272b2
mysqlbinlog.test:
...
Windows have no 'cat' command, use <
mysql.test:
Windows can't handle single quotes in --exec line
2005-09-24 04:11:51 +02:00
sergefp@mysql.com
061d660615
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-merge-sept24
2005-09-24 03:33:26 +04:00
monty@mysql.com
6c6a25e9d7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-09-24 02:32:34 +03:00
sergefp@mysql.com
9a05a887de
Manually merged
2005-09-24 02:39:52 +04:00
jimw@mysql.com
3cd331c29f
Merge mysql.com:/home/jimw/my/mysql-5.0-13361
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-23 10:03:29 -07:00
ingo@mysql.com
b9630b50d2
Merge mysql.com:/home/mydev/mysql-4.1-4100
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-09-23 17:27:07 +02:00
ingo@mysql.com
23cc6fe896
Bug#9112 - Merge table with composite index producing invalid results with some queries
...
After merge fix
2005-09-23 17:22:36 +02:00
dlenev@mysql.com
d68f3ea17d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg13407
2005-09-23 18:30:08 +04:00
osku@127.(none)
93671fb91e
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into 127.(none):/home/osku/mysql/5.0/clean
2005-09-23 16:46:59 +03:00
osku@127.(none)
d563a01afe
Merge 127.(none):/home/osku/mysql/5.0/clean
...
into 127.(none):/home/osku/mysql/5.0/3443
2005-09-23 16:44:25 +03:00
osku@127.(none)
d61708d1c9
Fix bug #3443 , better foreign key error messsages.
2005-09-23 16:22:27 +03:00
dlenev@mysql.com
77ac122350
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg13407
2005-09-23 17:10:05 +04:00
dlenev@mysql.com
3f9163b074
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-rmuqf
2005-09-23 17:03:49 +04:00
dlenev@mysql.com
b37c586ffe
Fixed race conditions in rpl_multi_update and rpl_multi_delete tests which
...
caused spurious test failures.
2005-09-23 16:59:19 +04:00
msvensson@neptunus.(none)
22c1bb4e6d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-23 14:38:26 +02:00
msvensson@neptunus.(none)
d55eeed8fd
Merge from 4.1 to 5.0
2005-09-23 14:37:22 +02:00
sergefp@mysql.com
40ba88ca07
Fix for BUG#13419: In "ref" optimizer, take into account that item=Item_func_in(x,y) is
...
not equivalent to "x=y" when item->negated == TRUE.
2005-09-23 13:43:20 +04:00
ingo@mysql.com
bf89c139a4
Merge mysql.com:/home/mydev/mysql-4.0-4000
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-09-23 10:49:08 +02:00
osku@127.(none)
945ea8a98b
Merge 127.(none):/home/osku/mysql/5.0/clean
...
into 127.(none):/home/osku/mysql/5.0/13315
2005-09-23 11:22:05 +03:00
osku@127.(none)
e6b3261556
InnoDB: Fix bug #13315 , index columns having a maximum length of 767.
2005-09-23 11:20:34 +03:00
ingo@mysql.com
4025d2965b
Bug#9112 - Merge table with composite index producing invalid results with some queries
...
The problem was an ab-use of last_rkey_length.
Formerly we saved the packed key length (of the search key)
in this element. But in certain cases it got replaced by
the (packed) result key length.
Now we use a new element of MI_INFO to save the packed key
length of the search key.
2005-09-23 10:15:11 +02:00
msvensson@neptunus.(none)
02c7645cc1
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-23 09:18:56 +02:00
konstantin@mysql.com
2d4c54ba1b
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-09-23 00:46:59 +04:00
dlenev@mysql.com
87dcb3c6f5
Fix for bug #13407 "Remote connecting crashes server" and couple of similar
...
problems which were introduced during work on WL#2787 "Add view definer/owner
to the view definition (.frm) to check privileges on used tables and stored
routines when using a VIEW."
In some cases it is better to use value from Security_context::host_or_ip
instead of value from Security_context::host since the latter can be NULL
in certain situations (When we can't resolve hostname or we have not done
this yet).
2005-09-22 23:03:53 +04:00