igor@rurik.mysql.com
e7f21dcef6
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-05-07 14:06:12 -07:00
igor@rurik.mysql.com
0928ae9bf4
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2006-05-07 11:25:33 -07:00
aelkin@mysql.com
f384cfe33c
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0-bug19136
2006-05-07 20:03:08 +03:00
aelkin@mysql.com
49bc52e5c9
Bug#19136: Crashing log-bin and uninitialized user variables in a derived table
...
recalculating results
2006-05-07 19:54:57 +03:00
sergefp@mysql.com
a6619a74d6
BUG#16798: Merge into 5.0: s/used_tables()/!const_item()/, added comment about its effects.
2006-05-07 19:01:49 +04:00
sergefp@mysql.com
d268cf6db1
Refactoring: Factor out common code from find_best() and best_access_path(): make
...
find_best() call best_access_path().
2006-05-07 18:07:08 +04:00
aelkin@mysql.com
899cf9b584
Merge mysql.com:/usr_rh9/home/elkin.rh9/4.1
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0-bug19136
2006-05-07 16:02:55 +03:00
aelkin@mysql.com
7dcd1383a8
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/4.1-bug19136_unass_user_var
2006-05-07 11:43:27 +03:00
igor@rurik.mysql.com
7977a0c867
Fixed bug #14927 .
...
A query with a group by and having clauses could return a wrong
result set if the having condition contained a constant conjunct
evaluated to FALSE.
It happened because the pushdown condition for table with
grouping columns lost its constant conjuncts.
Pushdown conditions are always built by the function make_cond_for_table
that ignores constant conjuncts. This is apparently not correct when
constant false conjuncts are present.
2006-05-06 23:48:13 -07:00
sergefp@mysql.com
ce766f2c52
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug16798-merge
2006-05-06 22:24:39 +04:00
sergefp@mysql.com
ceef1105b2
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug16798
2006-05-06 22:15:27 +04:00
kroki@mysql.com
f6c95ee81a
Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-merge
2006-05-06 19:45:24 +04:00
kroki@mysql.com
e00d7c1bf3
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501
2006-05-06 18:45:07 +04:00
kroki@mysql.com
b00df53ad5
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501
2006-05-06 18:40:56 +04:00
kroki@mysql.com
bf9ccde948
Fix race condition in the test for bug#16501.
2006-05-06 18:24:41 +04:00
ingo@mysql.com
2d907965ea
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug10405
2006-05-06 15:27:23 +02:00
ingo@mysql.com
42e35c6be3
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug10405
2006-05-06 13:35:48 +02:00
sergefp@mysql.com
cef2f703bf
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug16798
2006-05-06 13:48:20 +04:00
sergefp@mysql.com
8f8fa5838b
Merge mysql.com:/home/psergey/mysql-4.1-bug16798
...
into mysql.com:/home/psergey/mysql-5.0-bug16798-merge
2006-05-06 13:19:09 +04:00
sergefp@mysql.com
1b349cf85f
BUG#16798: Inapplicable ref_or_null query plan and bad query result on random occasions
...
The bug was as follows: When merge_key_fields() encounters "t.key=X OR t.key=Y" it will
try to join them into ref_or_null access via "t.key=X OR NULL". In order to make this
inference it checks if Y<=>NULL, ignoring the fact that value of Y may be not yet known.
The fix is that the check if Y<=>NULL is made only if value of Y is known (i.e. it is a
constant).
TODO: When merging to 5.0, replace used_tables() with const_item() everywhere in merge_key_fields().
2006-05-06 13:15:00 +04:00
kroki@mysql.com
3ad0cac41b
Reapply fix for bug#16372 (Server crashes when test 'conc_sys' is running)
...
after merge.
Concurrent read and update of privilege structures (like simultaneous
run of SHOW GRANTS and ADD USER) could result in server crash.
Ensure that proper locking of ACL structures is done.
No test case is provided because this bug can't be reproduced
deterministically.
2006-05-06 11:25:59 +04:00
kroki@mysql.com
0acef25de8
Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-merge
2006-05-06 11:18:42 +04:00
kroki@mysql.com
8eb1dd26ad
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-real
2006-05-06 10:09:56 +04:00
jani@hundin.mysql.fi
96d4b9ebd1
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/jani/mysql-5.0merge_4_1_2nd
2006-05-05 14:25:33 +03:00
jani@hundin.mysql.fi
b2c66756ab
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/jani/mysql-5.0merge_4_1_2nd
2006-05-05 12:46:15 +03:00
pekka@mysql.com
f717495693
Merge mysql.com:/space/pekka/ndb/version/my50
...
into mysql.com:/space/pekka/ndb/version/my50-work
2006-05-05 11:18:30 +02:00
msvensson@shellback.(none)
15ec5dfeca
Import from yaSSL
2006-05-05 10:35:12 +02:00
msvensson@shellback.(none)
01faaacd25
Import from yaSSL
2006-05-05 10:33:04 +02:00
aelkin@mysql.com
8c57924a6a
Bug#19136: Crashing log-bin and uninitialized user variables in a derived table
...
The reason of the bug is in that `get_var_with_binlog' performs missed
assingment of
the variables as side-effect. Doing that it eventually calls
`free_underlaid_joins' to pass as an argument `thd->lex->select_lex' of the lex
which belongs to the user query, not
to one which is emulated i.e SET @var1:=NULL.
`get_var_with_binlog' is refined to supply a temporary lex to sql_set_variables's stack.
2006-05-05 11:21:21 +03:00
kroki@mysql.com
d87e132379
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16372
2006-05-05 11:43:55 +04:00
kroki@mysql.com
009cf0b75e
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16372
2006-05-05 11:35:49 +04:00
kroki@mysql.com
bc1b9eb04f
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501
2006-05-05 11:35:38 +04:00
pekka@mysql.com
5ce418b260
ndb - bug#17421, changes NDB API pushdown LIKE arg to plain char
2006-05-05 00:53:34 +02:00
monty@mysql.com
047b9e318b
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-05-05 01:12:02 +03:00
jani@ua141d10.elisa.omakaista.fi
8b933cd63d
Added more comments to the test cases.
2006-05-05 00:27:12 +03:00
jani@ua141d10.elisa.omakaista.fi
c8e5ade80c
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2006-05-05 00:22:01 +03:00
paul@polar.kitebird.com
61632812e2
.del-changelog-5.0.xml~f4c50926ccdd7434:
...
Delete: Docs/changelog-5.0.xml
2006-05-04 16:21:10 -05:00
paul@polar.kitebird.com
57ff78b5fe
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2006-05-04 16:18:34 -05:00
paul@polar.kitebird.com
a1e6218461
.del-changelog-4.1.xml~8aa496ebed09d868:
...
Delete: Docs/changelog-4.1.xml
2006-05-04 16:16:18 -05:00
paul@polar.kitebird.com
e67a5619f9
Merge polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.0
...
into polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2006-05-04 16:15:31 -05:00
paul@polar.kitebird.com
2842d28d14
.del-changelog-4.0.xml~8f56ee8a913e848b:
...
Delete: Docs/changelog-4.0.xml
2006-05-04 16:14:19 -05:00
monty@mysql.com
0034e1c829
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-05-04 23:49:59 +03:00
jani@ua141d10.elisa.omakaista.fi
587a6c6c32
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2006-05-04 22:23:58 +03:00
monty@mysql.com
9e460e7a25
Fixed wrong free in sql_view.cc
...
mysql-test-run now fails in case of warnings
2006-05-04 22:19:31 +03:00
jani@hundin.mysql.fi
041669a4db
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/jani/mysql-5.0merge_4_1
2006-05-04 21:21:23 +03:00
jani@ua141d10.elisa.omakaista.fi
46f7b3366c
Fixed a test case that got broken during merge.
2006-05-04 21:21:22 +03:00
jani@ua141d10.elisa.omakaista.fi
06d6b7472b
Fixed Bug#11324:
...
TIME_FORMAT using "%l:%i" returns 36:00 with 24:00:00 in TIME column
2006-05-04 20:19:37 +03:00
jani@ua141d10.elisa.omakaista.fi
526e1a70e2
Fix for Bug#11326.
2006-05-04 19:31:10 +03:00
monty@mysql.com
ae83d6826d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-05-04 19:18:26 +03:00
msvensson@neptunus.(none)
4c866961ed
Bug#18474 Unlistable directories yield no info from information_schema, part2
...
- Move "chmod" part of information_schema test to separate file
2006-05-04 17:47:25 +02:00