tsmith@maint1.mysql.com
06060fd602
Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg50-b
...
into maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-b
2006-08-03 10:18:04 +02:00
msvensson@neptunus.(none)
554b1f019b
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-08-02 15:45:03 +02:00
evgen@sunlight.local
d6cf536d93
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
2006-08-02 02:19:46 +04:00
evgen@sunlight.local
d4f92cbb5c
Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
...
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
2006-08-01 20:52:21 +04:00
evgen@sunlight.local
a8405f650d
func_str.result:
...
After merge fix
2006-08-01 18:55:44 +04:00
gkodinov/kgeorge@rakia.(none)
8cf5a4c04e
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/B20103-5.0-opt
2006-08-01 11:17:14 +03:00
gkodinov/kgeorge@macbook.gmz
7b5e4ed026
Bug #20103 : Escaping with backslash does not work
...
- make the client to respect the server-side
no_backslash_escapes option and disable the
special meaning of backslash also at client side.
2006-08-01 11:05:54 +03:00
msvensson@neptunus.(none)
39130d15eb
Merge neptunus.(none):/home/msvensson/mysql/my51-m-bug19535
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-08-01 09:33:00 +02:00
evgen@sunlight.local
dda7a95c59
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
2006-08-01 09:24:19 +04:00
evgen@sunlight.local
799ecc9f2a
After merge fix
2006-08-01 08:49:43 +04:00
gkodinov/kgeorge@rakia.(none)
63d198af1c
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/B11551-5.0-opt
2006-08-01 06:11:11 +03:00
evgen@sunlight.local
6806776eed
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
2006-08-01 06:42:33 +04:00
evgen@sunlight.local
1007b441df
Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
...
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
2006-07-31 23:49:52 +04:00
lars/lthalmann@dl145j.mysql.com
418d4eb39d
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-07-31 21:36:10 +02:00
evgen@moonbone.local
b43b2a2fe0
select.result, func_group.result, sql_select.cc:
...
After merge fix
2006-07-31 23:05:54 +04:00
sergefp@mysql.com
6056f7714e
BUG#14940: Post-merge fixes: update test results
2006-07-31 22:22:01 +04:00
gkodinov/kgeorge@rakia.(none)
a5e56e8942
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/B11551-5.0-opt
2006-07-31 21:17:20 +03:00
gkodinov/kgeorge@macbook.gmz
8084a9e5fb
Bug #11551 : Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE
...
made DROP VIEW to continue on error and report an aggregated error
at its end. This makes it similar to DROP TABLE.
2006-07-31 20:56:06 +03:00
gkodinov/kgeorge@macbook.gmz
8d4684b6b4
Merge bk-internal:/home/bk/mysql-5.0-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B21080-5.0-opt
2006-07-31 17:40:09 +03:00
gkodinov/kgeorge@macbook.gmz
8944564fd8
Bug #21080 : ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
...
When executing ALTER TABLE all the attributes of the view were overwritten.
This is contrary to the user's expectations.
So some of the view attributes are preserved now : namely security and
algorithm. This means that if they are not specified in ALTER VIEW
their values are preserved from CREATE VIEW instead of being defaulted.
2006-07-31 17:33:37 +03:00
sergefp@mysql.com
05f7872124
BUG#14940: Post-merge fixes
2006-07-30 18:25:57 +04:00
aivanov/alexi@mysql.com/mysqld.localdomain
8851926544
Make innodb_thread_concurrency 0 by default.
...
Fixing test result.
2006-07-30 05:16:08 +04:00
evgen@sunlight.local
ef4f149536
Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
...
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
2006-07-30 00:33:24 +04:00
sergefp@newbox.mylan
ee3c1deed4
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/psergey/mysql-5.1-bug14940-r4
2006-07-30 00:02:42 +04:00
evgen@sunlight.local
3ca575dc89
Merge sunlight.local:/local_work/tmp_merge-4.1-opt-mysql
...
into sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
2006-07-29 23:59:53 +04:00
evgen@sunlight.local
8cd88a9179
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
2006-07-29 23:54:55 +04:00
evgen@sunlight.local
285e392512
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into sunlight.local:/home/evgen/bk-trees/mysql-5.1-opt
2006-07-29 23:44:40 +04:00
jimw@rama.(none)
69f9fe7531
Fix tests after merge and disable rpl_ndb_dd_advance due to bug 18679.
2006-07-28 19:39:34 -07:00
jimw@rama.(none)
f7e19b40f3
Merge rama.(none):/home/jimw/my/tmp_merge
...
into rama.(none):/home/jimw/my/mysql-5.1-clean
2006-07-28 15:51:48 -07:00
sergefp@mysql.com
699291a8e6
BUG#14940 "MySQL choose wrong index", v.2
...
- Make the range-et-al optimizer produce E(#table records after table
condition is applied),
- Make the join optimizer use this value,
- Add "filtered" column to EXPLAIN EXTENDED to show
fraction of records left after table condition is applied
- Adjust test results, add comments
2006-07-28 21:27:01 +04:00
kostja@bodhi.local
4bd7acec3f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-07-28 18:02:38 +04:00
kostja@bodhi.local
024960aa2d
Post-merge fixes.
2006-07-27 14:12:41 +04:00
gkodinov/kgeorge@rakia.(none)
21e6d13147
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/B21019-5.0-opt
2006-07-27 10:11:13 +03:00
gkodinov/kgeorge@rakia.(none)
351554e121
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/B20792-4.1-opt
2006-07-27 10:06:37 +03:00
msvensson@neptunus.(none)
e47f61a01c
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-07-27 05:55:42 +02:00
kostja@bodhi.local
73189969f3
Merge bodhi.local:/opt/local/work/tmp_merge
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-07-26 23:33:25 +04:00
kostja@bodhi.local
bea330494c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-07-26 21:48:45 +04:00
gkodinov/kgeorge@rakia.(none)
e2a082aa32
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/B20792-4.1-opt
2006-07-26 19:55:33 +03:00
gkodinov/kgeorge@macbook.gmz
609befda87
Merge macbook.gmz:/Users/kgeorge/mysql/work/B20792-4.1-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B20792-5.0-opt
2006-07-26 19:23:44 +03:00
gkodinov/kgeorge@macbook.gmz
565d495997
* Bug #20792 : Incorrect results from aggregate subquery
...
When processing aggregate functions all tables values are reset
to NULLs at the end of each group.
When doing that if there are no rows found for a group
the const tables must not be reset as they are not recalculated
by do_select()/sub_select() for each group.
2006-07-26 19:19:30 +03:00
gkodinov/kgeorge@rakia.(none)
49f8ec4c99
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/B21019-4.1-opt
2006-07-26 18:49:26 +03:00
gkodinov/kgeorge@macbook.gmz
334e264b5a
Bug #21019 : First result of SELECT COUNT(*) different than consecutive runs
...
Correct merge
2006-07-26 18:18:34 +03:00
gkodinov/kgeorge@macbook.gmz
66e65eff14
Merge macbook.gmz:/Users/kgeorge/mysql/work/B21019-4.1-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B21019-5.0-opt
2006-07-26 17:31:34 +03:00
msvensson@neptunus.(none)
4632f97e21
Merge 192.168.0.20:mysql/my51-m-bug21039
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-07-26 14:29:09 +02:00
msvensson@neptunus.(none)
13aba17bf3
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060721184912|58688
2006-07-26 14:27:52 +02:00
msvensson@shellback.(none)
a1ec4fe7f0
Bug#21039 Transaction cache not flushed after SELECT CREATE
...
- Add prelocking for stored procedures that uses sp or sf
- Update test result for sp_error(reported as bug#21294)
- Make note about new error message from sp-error(bug#17244)
2006-07-26 12:40:26 +02:00
gkodinov/kgeorge@macbook.gmz
6766cfcdf9
Bug #21019 : First result of SELECT COUNT(*) different than consecutive runs
...
When optimizing conditions like 'a = <some_val> OR a IS NULL' so that they're
united into a single condition on the key and checked together the server must
check which value is the NULL value in a correct way : not only using ->is_null
but also check if the expression doesn't depend on any tables referenced in the
current statement.
This additional check must be performed because that optimization takes place
before the actual execution of the statement, so if the field was initialized
to NULL from a previous statement the optimization would be applied incorrectly.
2006-07-26 13:32:28 +03:00
gkodinov/kgeorge@rakia.(none)
67dd8dce0e
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/B21086-5.0-opt
2006-07-26 11:56:39 +03:00
timour/tkatchaounov@lamia.home
dd7ae38de4
Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into lamia.home:/home/tkatchaounov/autopush/4.1-bug-20954
2006-07-26 01:21:35 +03:00
timour/timka@lamia.home
86ae2f3b06
Fix for BUG#20954: avg(keyval) retuns 0.38 but max(keyval) returns an empty set
...
The problem was in that opt_sum_query() replaced MIN/MAX functions
with the corresponding constant found in a key, but due to imprecise
representation of float numbers, when evaluating the where clause,
this comparison failed.
When MIN/MAX optimization detects that all tables can be removed,
also remove all conjuncts in a where clause that refer to these
tables. As a result of this fix, these conditions are not evaluated
twice, and in the case of float number comparisons we do not discard
result rows due to imprecise float representation.
As a side-effect this fix also corrects an unnoticed problem in
bug 12882.
2006-07-26 01:11:19 +03:00