Commit graph

22218 commits

Author SHA1 Message Date
jimw@mysql.com
63fa61c6e2 Carry over change to fix build on ICC that was lost in merge from 4.1. 2005-04-27 10:01:41 -07:00
georg@lmy002.wdf.sap.corp
7d6c12313e fix for compile error (Windows) 2005-04-27 13:54:42 +02:00
jimw@mysql.com
fcc04b2ffd Merge changes to acinclude.m4 that are now in config/ac-macros/misc.m4 2005-04-26 08:23:42 -07:00
jimw@mysql.com
ef5ad50ccc Merge mysql.com:/home/jimw/my/mysql-4.1-9063
into mysql.com:/home/jimw/my/mysql-5.0-build
2005-04-26 08:20:51 -07:00
jimw@mysql.com
a296ccfd28 Fix typo in include file name (Bug ) 2005-04-26 08:20:00 -07:00
jimw@mysql.com
93ff028f9d Fix compile issues in Intel C/C++ compiler (Bug ) 2005-04-25 18:02:03 -07:00
sergefp@mysql.com
a27e830385 BUG#10037: A proper fix: Add 0.01 to cost of 'range' scans, don't add 0.01 to cost of the 'index' scan. 2005-04-26 01:56:10 +04:00
lenz@mysql.com
83c289665f - fixed NDB_VERSION_BUILD in configure.in to have the correct number (4->5) 2005-04-25 13:28:07 +02:00
joreland@mysql.com
ab7446d75a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-25 12:02:34 +02:00
joreland@mysql.com
004ec3838d Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-25 11:59:50 +02:00
joreland@mysql.com
280bef1845 bug#9749 - ndb lock upgrade
post review fix.
  don't init hash value on restart operations
  make sure that lock mode is correct in entire que.
2005-04-25 11:59:00 +02:00
mskold@mysql.com
1589bdf3dc Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-25 11:55:27 +02:00
mskold@mysql.com
93498bdf5a Post review fix of ndbcluster_drop_database, typo 2005-04-25 11:54:00 +02:00
mskold@mysql.com
2fd313de2f Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-25 11:47:39 +02:00
mskold@mysql.com
4649d5c30f Post review fix of ndbcluster_drop_database, print error 2005-04-25 11:34:47 +02:00
mskold@mysql.com
3a9af0553b Post review fix of ndbcluster_drop_database 2005-04-25 11:31:16 +02:00
dlenev@mysql.com
814d4bf3e8 Merge mysql.com:/home/dlenev/src/mysql-4.1-bg10040
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-04-25 11:35:30 +04:00
dlenev@mysql.com
71c7c0d341 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg10040
2005-04-25 11:26:20 +04:00
dlenev@brandersnatch.localdomain
a4a4c5cb69 Fix for func_sapdb failures on 64-bit platforms (aka Bug
"'func_sapdb' fails on 64bit build hosts")
2005-04-25 11:25:40 +04:00
joreland@mysql.com
b57eab4377 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-25 08:44:05 +02:00
joreland@mysql.com
12e0d4f588 ndb - autotest
add more tests to verify correctness of backups
2005-04-25 08:43:16 +02:00
joreland@mysql.com
c4d44841c4 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-25 08:38:28 +02:00
joreland@mysql.com
763d835a3c bug#9924 - ndb backup
remove incorrect assertion
2005-04-25 08:35:18 +02:00
sergefp@mysql.com
db6cc1ed17 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug8490-2
2005-04-25 04:25:32 +04:00
guilhem@mysql.com
fd4b0af169 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-xa
2005-04-24 22:39:42 +02:00
guilhem@mysql.com
3022cbc60c Informing of deprecation of mysql_tableinfo by INFORMATION_SCHEMA (and
I'm thinking of removing the script in 5.1).
2005-04-24 22:37:43 +02:00
joreland@mysql.com
e1e050432d Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-24 20:38:53 +02:00
joreland@mysql.com
798e78787c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-24 20:37:31 +02:00
joreland@mysql.com
d9d1c933b0 bug#9924 - ndb backup - abort handling
uninit variable
2005-04-24 20:34:42 +02:00
pekka@mysql.com
48d6d545c0 ndb - post merge 4.1->5.0 2005-04-23 18:51:18 +02:00
pekka@mysql.com
850211eb73 Merge 2005-04-23 17:55:21 +02:00
pekka@mysql.com
6778b029e0 ndb - bug#10029 fix 2005-04-23 17:33:12 +02:00
sergefp@mysql.com
51064c0575 Fix for BUG#10107: Memory leak in view over subquery:
In mysql_make_view when joining subquery lists, take into account that both lists
can have length > 1 (see also fix for BUG#8490) 
(note to bk trigger: this commit is about BUG#10107)
2005-04-23 06:55:43 +04:00
gbichot@quadita2.mysql.com
b75789e3d8 Fixes for BUG#10039 "MEMORY engine is reported as HEAP",
BUG#9738 "SHOW VARIABLES still displays the deprecated 'log_update' in 5.0",
BUG#9542 "MySQL dies with signal 11 when it is using non-existent location of binary logs"
2005-04-23 00:05:05 +02:00
sergefp@mysql.com
d7a1549b07 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug8490-2
2005-04-23 00:52:33 +04:00
sergefp@mysql.com
307c0cf908 Fix for BUG#8490: In mysql_make_view for join algorithm views we need
to insert view's subqueries into select_lex->slave(->next)* chain. 
In case a join has several such views, don't add the same subqueries several times
(this forms a loop on the above chain which breaks many parts of the code)
2005-04-23 00:13:46 +04:00
ingo@mysql.com
a0c3aed75f Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-04-22 19:16:10 +02:00
mskold@mysql.com
c27c54f49d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-22 17:41:06 +02:00
mskold@mysql.com
fd7176121e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-22 17:40:19 +02:00
mskold@mysql.com
5411f8a6e4 Merge 2005-04-22 17:38:28 +02:00
ingo@mysql.com
d859eafa83 Bug#7806 - insert on duplicate key and auto-update of timestamp
Merged fix for bugfix to 5.0.
2005-04-22 17:13:18 +02:00
mskold@mysql.com
9457551616 Fix for Bug drop database does not drop ndb tables 2005-04-22 15:28:23 +02:00
joreland@mysql.com
cde3ff4d26 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-04-22 13:20:47 +02:00
pem@mysql.com
5fcfb8a442 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-04-22 12:55:44 +02:00
pem@mysql.comhem.se
057b8aa9a8 Fixed BUG#9004: Inconsistent behaviour of SP re. warnings 2005-04-22 12:53:48 +02:00
joreland@mysql.com
3294a34ed2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-22 12:53:07 +02:00
ingo@mysql.com
0e7f6a601f Bug#7806 - insert on duplicate key and auto-update of timestamp
A fix of the original patch.
Correctly clear a bit from an enum value.
2005-04-22 12:30:09 +02:00
joreland@mysql.com
5f5f25c0bc Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-22 11:12:08 +02:00
joreland@mysql.com
0bfc924672 bug#9724 - ndb restart
if file already open occur print files...
2005-04-22 11:04:26 +02:00
joreland@mysql.com
325918ee31 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-22 09:47:12 +02:00