joerg@mysql.com
fea0745ba8
Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/push-5.0
2005-08-25 11:46:17 +02:00
monty@mishka.mysql.com
aa18382680
Make test predictable
2005-08-25 12:03:19 +03:00
monty@mishka.mysql.com
848c936693
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.mysql.com:/home/my/mysql-5.0
2005-08-25 10:44:08 +03:00
andrey@lmy004.
d4a25c1b36
Merge lmy004.:/work/mysql-5.0-clean
...
into lmy004.:/work/mysql-5.0-bug12533-2
2005-08-25 09:38:59 +02:00
andrey@lmy004.
dde57f082b
fix for bug #12533 (crash on DESCRIBE <view> after renaming base table column)
2005-08-25 09:24:21 +02:00
monty@mishka.mysql.com
9605c5dba2
Add back changes lost in merge
...
(Faster test)
2005-08-25 10:19:06 +03:00
monty@mishka.local
b90d7fe3b6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-08-25 09:40:40 +03:00
monty@mishka.local
f384e08277
Merge mishka.local:/home/my/mysql-4.1
...
into mishka.local:/home/my/mysql-5.0
2005-08-25 06:55:48 +03:00
kent@mysql.com
bd2901a250
disabled.def:
...
Disabled unstable tests, bugs filed
2005-08-25 02:27:52 +02:00
jimw@mysql.com
9e4a9e23c6
Make SYSDATE() behave as in Oracle: always the current datetime, not the
...
datetime of when the current statement began. This also makes SYSDATE()
not safe in replication. (Bug #12562 )
2005-08-24 15:50:58 -07:00
serg@sergbook.mysql.com
714b27c71c
merged
2005-08-25 00:08:02 +04:00
monty@mishka.local
17654cd7af
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-08-24 20:55:54 +03:00
monty@mishka.local
8e6aa0e7ea
Review fixes
2005-08-24 19:37:27 +03:00
igor@rurik.mysql.com
b610c0972f
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-24 08:19:02 -07:00
igor@rurik.mysql.com
17d6c734f4
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-08-24 08:15:46 -07:00
petr@mysql.com
2df4914e11
fix test for a bug to use correct tables
2005-08-24 12:25:57 +04:00
osku@127.(none)
55c752fb37
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into 127.(none):/home/osku/mysql-5.0
2005-08-24 09:25:32 +03:00
igor@rurik.mysql.com
4adc90bdd6
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-23 23:22:52 -07:00
igor@rurik.mysql.com
5810291c2f
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-08-23 23:19:45 -07:00
timour@mysql.com
f58315f80a
Test for BUG#6495.
...
The bug itself is fixed by WL#2486.
2005-08-23 22:29:05 +03:00
timour@mysql.com
5f9d05d306
Test for BUG#4889 - inconsistent resilts of more than 2-way natural join
...
due to incorrect transformation to JOIN ... ON.
The bug itself is fixed by WL#2486.
2005-08-23 20:24:29 +03:00
timour@mysql.com
9a6aefab3a
Fix for BUG#6276.
2005-08-23 20:03:32 +03:00
timour@mysql.com
2f2347e556
Test case for BUG#10972 - Natural join of view and underlying table gives wrong result.
...
The bug itself is fixed by WL#2486.
2005-08-23 19:00:28 +03:00
timour@mysql.com
f5655423aa
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-23 18:43:12 +03:00
timour@mysql.com
b87154fc02
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-dbg
2005-08-23 18:40:57 +03:00
timour@mysql.com
bf8563ae1d
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-23 18:15:51 +03:00
timour@mysql.com
e040300393
WL#2486 - natural and using join according to SQL:2003
...
* Provide backwards compatibility extension to name resolution of
coalesced columns. The patch allows such columns to be qualified
with a table (and db) name, as it is in 4.1.
Based on a patch from Monty.
* Adjusted tests accordingly to test both backwards compatible name
resolution of qualified columns, and ANSI-style resolution of
non-qualified columns.
For this, each affected test has two versions - one with qualified
columns, and one without.
2005-08-23 18:08:04 +03:00
serg@sergbook.mysql.com
1fbb96ea97
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-08-23 14:16:17 +04:00
dlenev@mysql.com
603dddfdb4
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg11896
2005-08-23 09:15:05 +04:00
igor@rurik.mysql.com
21b63441f5
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-22 17:46:21 -07:00
igor@rurik.mysql.com
bbd04e6bcf
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-08-22 17:33:59 -07:00
igor@rurik.mysql.com
94166de5f3
sql_show.cc:
...
Database name was set incorrectly for any show command
that used sunqueries in its where condition.
information_schema.test, information_schema.result:
Added a test case for bug #12636 .
2005-08-22 17:32:02 -07:00
jimw@mysql.com
f70beef6c7
Use the hostname with which the user authenticated when determining which
...
user to update with 'SET PASSWORD = ...'. (Bug #12302 )
2005-08-22 15:48:50 -07:00
jimw@mysql.com
247e9421fa
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-22 11:54:33 -07:00
jimw@mysql.com
bb4af4f176
Merge mysql.com:/home/jimw/my/mysql-5.0-12689
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-22 10:19:09 -07:00
monty@mishka.local
7767828b81
Don't write first even that contains server version
2005-08-22 19:56:36 +03:00
igor@rurik.mysql.com
8c34d8e578
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-08-22 09:40:10 -07:00
timour@mysql.com
310afc80dd
Test case for BUG#10646
...
The bug itself is fixed by WL #2486 .
2005-08-22 17:34:08 +03:00
timour@mysql.com
c04138ec94
Test case for BUG#6558 - Views: create fails with JOIN ... USING
...
The bug is non-view specific, and it resulted from incorrect
name resolution of natural join result columns. The bug is
fixed by WL#2486.
2005-08-22 17:04:55 +03:00
hf@deer.(none)
bded7c984b
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.9645
2005-08-22 18:24:17 +05:00
monty@mishka.local
49413542bd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-08-22 16:06:00 +03:00
evgen@moonbone.local
f5f6ed8b78
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/11398-bug-5.0-mysql
2005-08-22 15:46:09 +04:00
osku@127.(none)
216227d8a2
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into 127.(none):/home/osku/mysql-5.0
2005-08-22 12:53:54 +03:00
jonas@eel.(none)
f4f63f0351
ndb -
...
Fix merge error
2005-08-22 11:34:33 +02:00
serg@sergbook.mysql.com
eadb86d56f
after pull cleanup
2005-08-22 13:20:02 +04:00
hf@deer.(none)
45b07fd422
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.9645
2005-08-22 13:08:44 +05:00
jonas@eel.(none)
a58c0e7dae
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-21 16:35:27 +02:00
jonas@eel.(none)
daec6e5ebd
Merge eel.(none):/home/jonas/src/mysql-4.1-push
...
into eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-21 16:24:53 +02:00
jonas@eel.(none)
5823c91f88
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-21 16:22:08 +02:00
monty@mishka.local
ba2ace25a9
Merge mishka.local:/tmp/skr99/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-08-21 13:05:15 +03:00