Commit graph

22304 commits

Author SHA1 Message Date
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
joerg@mysql.com
70ed0ea4cb Step 3 of the switch to support configuration with NPTL:
Change "configure.in".

The branches for Tru64 (ex: OSF/1) and Linux are separated,
and for Linux 'getconf GNU_LIBPTHREAD_VERSION' is used to tell between Linuxthreads and NPTL.
2005-04-22 20:49:05 +02: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 #9318 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
joreland@mysql.com
bbd0aa6cc3 bug#9969 - ndb
missleading error message
2005-04-22 09:40:44 +02:00
joreland@mysql.com
2ce7824e3f merge 2005-04-22 09:30:23 +02:00
joreland@mysql.com
e6142c477c bug#9924 - ndb backup abort handling
Redo abort handling according to descr. in Backup.txt
bug#9960 - ndb backup
      increase wait completed timeout to 48 hours
2005-04-22 09:07:25 +02:00
dlenev@mysql.com
51ca05b6e3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg9486
2005-04-22 10:51:04 +04:00
msvensson@neptunus.(none)
06d29ea2b7 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/bug2596
2005-04-21 21:52:31 +02:00
msvensson@neptunus.(none)
5b74b6fd3b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-21 21:51:36 +02:00
msvensson@neptunus.(none)
0c23f81dcb C99 Portability fix 2005-04-21 21:47:58 +02:00
lenz@mysql.com
d4b4cab910 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-04-21 21:28:13 +02:00
msvensson@neptunus.(none)
63e57eeb1a Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/bug2596
2005-04-21 21:25:34 +02:00
lenz@mysql.com
a70a3a8ed9 Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0-build
2005-04-21 21:17:42 +02:00
lenz@mysql.com
11bb365f68 - added missing file config_readline.h to the source distribution 2005-04-21 21:15:35 +02:00
acurtis@xiphis.org
310c360465 C99 Portability fix 2005-04-21 18:38:34 +01:00
ramil@mysql.com
50ada0a01c A fix (Bug #9489: Problem with BIT_OR and MySQL 5.0.3) 2005-04-21 21:06:08 +05:00
acurtis@xiphis.org
a6b68d51ec Bug#8861
Correct previous bugfix
2005-04-21 15:36:10 +01:00
acurtis@xiphis.org
c5d94db336 Merge 2005-04-21 13:34:39 +01:00
acurtis@xiphis.org
f67507588f Bug#8861 - If Return is a YEAR data type, value is not shown in year format
Bug partially fixed by 9775/9102 work on SP function return.
2005-04-21 13:22:47 +01:00
mskold@mysql.com
564eb3dc98 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-21 13:12:59 +02:00
mskold@mysql.com
29f8460e7b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-21 13:10:05 +02:00
mskold@mysql.com
ad9fba9f38 Fix for failing ps_7ndb.test, force write_row when batching inserts so that update of primary key is done before next value to insert 2005-04-21 13:09:19 +02:00
pekka@mysql.com
f0c6908a5a Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/export/space/pekka/ndb/version/my50
2005-04-21 12:55:19 +02:00
pekka@mysql.com
ae2346dd94 ndb - fix typo 2005-04-21 12:53:40 +02:00
lenz@mysql.com
acfd4070cb Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-04-21 12:43:12 +02:00
msvensson@neptunus.(none)
0c8c032f0d Reverting back to original path of readline.h 2005-04-21 12:36:23 +02:00