gluh@eagle.intranet.mysql.r18.ru
2a07350854
ps_6bdb, ps_7ndb tests failure fix
2005-09-12 14:21:38 +05:00
bar@mysql.com
2f13c5c12c
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b12891
2005-09-12 14:09:44 +05:00
lars@mysql.com
683edc6599
Reverted old fix with sync_slave_with_master and added a replace commands
...
to eliminate nondeterminism in slave start
2005-09-12 10:50:42 +02:00
ramil@mysql.com
c4ea0e2bf8
merging
2005-09-12 12:09:44 +05:00
timour@mysql.com
7205d3716c
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-dbg
2005-09-12 09:34:58 +03:00
timour@mysql.com
6a528590d9
Fix for BUG#13067 "JOIN ... USING is case sensitive".
2005-09-12 08:28:53 +03:00
evgen@moonbone.local
75841099ca
Fix bug #12993 View column rename broken in subselect
...
When view column aliased in subselect alias is set on ref which represents
field. When tmp table is created for subselect, it takes name of original field
not ref. Because of this alias on view column in subselect is lost. Which
results in reported error.
Now when alias is set on ref, it's set on ref real item too.
2005-09-12 02:46:35 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
afb613bd8e
Merged from 4.1
2005-09-11 22:10:04 +03:00
lars@mysql.com
e5503c277f
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
...
into mysql.com:/users/lthalmann/bk/mysql-4.1-magnus
2005-09-11 13:46:36 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
91b6fe2679
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-09-11 11:07:56 +03:00
lars@mysql.com
f8594113cf
Merge mysql.com:/users/lthalmann/bk/mysql-4.1-one_shot
...
into mysql.com:/users/lthalmann/bk/mysql-5.0
2005-09-11 01:23:08 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
2917515afc
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-09-10 18:41:37 +03:00
timour@mysql.com
7d24bdac22
Fix for BUG#12943.
...
The problem was that in the first production in rule 'join_table', that
processes simple cross joins, the parser was processing the second join operand
before the first one due to unspecified priorities of JOINs. As a result in the
case of cross joins the parser constructed a tree with incorrect nesting:
the expression "t1 join t2 join t3 on some_cond" was interpreted as
"t1 join (t2 join t3 on some_cond)" instead of
"(t1 join t2) join t3 on some_cond".
Because of this incorrect nesting the method make_join_on_context picked an
incorrect table as the first table of the name resolution context.
The solution assignes correct priorities to the related production.
2005-09-10 15:01:54 +03:00
patg@radha.local
a237d20152
BUG #12597 after merge, needed to produce results
2005-09-10 01:50:39 +02:00
patg@radha.local
f41aa04b59
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597
2005-09-10 01:50:38 +02:00
evgen@moonbone.local
94f5e80c86
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/12695-bug-4.1-mysql
2005-09-10 02:31:42 +04:00
evgen@moonbone.local
99c0bf333c
insert_select.result, insert_select.test:
...
Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did
not update const_item_cache.
2005-09-10 02:30:26 +04:00
patg@radha.local
15bbf4d215
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597
2005-09-09 21:03:11 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
ac95c9096b
Fixed Bug#10716, Procedure Analyse results in wrong values for optimal field type
...
Added test case.
2005-09-09 20:02:13 +03:00
patg@radha.local
9faaeb2508
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056
2005-09-09 18:19:47 +02:00
gluh@eagle.intranet.mysql.r18.ru
1a9cf5b63b
after merge fix
2005-09-09 17:51:13 +05:00
gluh@mysql.com
729829f3b2
manual merge
2005-09-09 16:52:44 +05:00
serg@serg.mylan
78590ad53b
aftermerge
2005-09-09 12:47:57 +02:00
serg@serg.mylan
3d7844ca89
merged
2005-09-09 12:43:25 +02:00
serg@serg.mylan
f16bb5da7e
aftermerge
2005-09-09 12:15:25 +02:00
andrey@lmy004.
06fe0537c3
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy004.:/work/mysql-5.0-bug12651
2005-09-09 11:27:21 +02:00
sergefp@mysql.com
98fee7f289
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-merge
2005-09-09 12:57:41 +04:00
sergefp@mysql.com
cd813a0911
Post-merge fixes
2005-09-09 12:57:00 +04:00
serg@serg.mylan
b69f49c0d5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-09 10:49:09 +02:00
andrey@lmy004.
13d3cf8ff6
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy004.:/work/mysql-5.0-bug12651
2005-09-09 10:27:58 +02:00
gluh@eagle.intranet.mysql.r18.ru
99bc9607e1
Bug#12817 SHOW STATUS now blob fields
...
This fix is cancellation of ChangeSet
1.2329 05/07/12 08:35:30 reggie@linux.site +8 -0
Bug 7142 Show Fields from fails using Borland's dbExpress interface
The reason is we can't fix bug#7142 without
breaking of existing applications/APIs that worked fine with earlier 4.1
bug 7142 is fixed in 5.0
2005-09-09 13:22:16 +05:00
ramil@mysql.com
9730b5369a
A fix (bug #12917 : The --defaults-extra-file option is ignored by the 5.0 client binaries).
2005-09-09 12:51:43 +05:00
sergefp@mysql.com
57c3ed9e1c
Post-merge fixes
2005-09-09 11:50:38 +04:00
andrey@lmy004.
b7440b7a55
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy004.:/work/mysql-5.0-bug12651
2005-09-09 09:46:13 +02:00
serg@serg.mylan
c7eaac52b3
merged
2005-09-09 09:44:58 +02:00
andrey@lmy004.
f93c54205d
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy004.:/work/mysql-5.0-bug12651
2005-09-09 09:10:56 +02:00
sergefp@mysql.com
3d6759d190
Merge 4.1->5.0
2005-09-09 10:54:59 +04:00
sergefp@mysql.com
eac4388caf
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug12943
2005-09-09 10:08:46 +04:00
serg@serg.mylan
819db2471c
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-09-09 01:04:54 +02:00
igor@rurik.mysql.com
6bbdd66e89
olap.result, olap.test:
...
Added a test case with VIEW for bug #12885 .
2005-09-08 15:45:31 -07:00
patg@radha.local
06d1582b98
BUG #12597 This is a complete patch (2nd) containing fixes per Serg's review
2005-09-09 00:03:07 +02:00
serg@serg.mylan
7e9646f05d
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-09-08 23:11:15 +02:00
serg@serg.mylan
a7f2179c29
BUG#12695: Item_func_isnull::update_used_tables did not update const_item_cache
2005-09-08 22:57:27 +02:00
igor@rurik.mysql.com
b2f0f9085f
Manual merge
2005-09-08 13:45:49 -07:00
igor@rurik.mysql.com
bcae525685
Manual merge
2005-09-08 13:44:36 -07:00
patg@radha.local
4171c7435a
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056
2005-09-08 22:29:13 +02:00
igor@rurik.mysql.com
19192328f2
sql_select.cc:
...
Fixed bug #12885 .
Forced inheritence of the maybe_null flag for the expressions
containing GROUP BY attributes in selects with ROLLUP.
olap.test, olap.result:
Added test case for bug #12885 .
2005-09-08 12:37:16 -07:00
andrey@lmy004.
1a46ea1057
fix for bug #12651 (item of a prepared query allocated on non-permanent
...
are thus dangling later)
2005-09-08 21:30:05 +02:00
timour@mysql.com
13d8179157
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-09-08 21:02:19 +03:00
patg@radha.local
4cb63e6b8b
BUG #9056 Changes to patch #2 per Serg's review
2005-09-08 19:45:25 +02:00
