jonas@perch.ndb.mysql.com
7f71a8ebab
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-03-27 10:21:52 +02:00
jonas@perch.ndb.mysql.com
a3b51fda9f
ndb - autotest
...
Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert()
Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
2006-03-27 10:18:48 +02:00
bpontz@shasta.mysql.com
edb9e3c9fb
added option for netware build
2006-03-26 21:23:15 -05:00
bpontz@shasta.mysql.com
e4f9d23598
added option for netware build
2006-03-26 21:19:43 -05:00
brian@zim.(none)
cafbe1ec29
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-03-26 01:35:45 -08:00
brian@zim.(none)
f940472d5a
Fix to remove engine dependency from handler.cc file, the last one for functions.
2006-03-26 01:32:52 -08:00
dlenev@mysql.com
e7d2b09e14
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/dlenev/mysql-5.1-merges
2006-03-25 19:03:09 +03:00
dlenev@mysql.com
56e415a512
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
...
into mysql.com:/home/dlenev/mysql-5.1-merges
2006-03-25 18:55:02 +03:00
kent@mysql.com
625ab8a064
configure.in:
...
AC_ARG_WITH inside "if" sometimes gives unexpected result,
--with-fast-mutexes was not ignored when --with-debug given
2006-03-25 13:38:37 +01:00
andrey@lmy004.
d770c77504
update
2006-03-25 13:14:52 +01:00
andrey@lmy004.
fd35e81b75
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16415
2006-03-25 13:05:34 +01:00
dlenev@mysql.com
85c1e4d25f
Updated test case. SHOW CREATE TABLE uses uppercase DEFAULT clause in 5.1.
2006-03-25 12:07:45 +03:00
andrey@lmy004.
288fe2f139
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16415
2006-03-25 01:12:06 +01:00
igor@rurik.mysql.com
ec4910c413
Merge rurik.mysql.com:/home/igor/mysql-5.1
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-03-24 15:24:06 -08:00
dlenev@mysql.com
880d1ccd64
Merge mysql.com:/home/dlenev/mysql-5.0-bg18153
...
into mysql.com:/home/dlenev/mysql-5.1-merges
2006-03-25 02:24:05 +03:00
andrey@lmy004.
75cba7b5cc
manual merge
2006-03-25 00:24:04 +01:00
bpontz@shasta.mysql.com
676580c29d
changed version number
2006-03-24 18:24:04 -05:00
dlenev@mysql.com
8643070cda
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/dlenev/mysql-5.1-merges
2006-03-25 02:24:04 +03:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
988d55f1d6
Redisabled partition_03ndb, hangs
2006-03-24 18:24:03 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
fe8123f276
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
2006-03-24 18:22:32 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
24897407d6
BUG#16806: ALTER TABLE with new field in before position fails
...
Review fixes
2006-03-24 18:21:43 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
4362a7a1b6
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
2006-03-24 17:34:12 -05:00
knielsen@mysql.com
bc83d09513
Merge mysqldev@win2003-x86:my/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/mysql-5.1-win-src
2006-03-24 23:24:26 +01:00
knielsen@mysql.com
c05590707d
Add missing cmakelists.txt for archive.
2006-03-24 23:19:59 +01:00
knielsen@mysql.com
bc6628d27f
Some changes to make it possible to build for Windows with CMake from
...
a normal 'make dist' source .tar.gz.
2006-03-24 22:50:56 +01:00
igor@rurik.mysql.com
1fd7f10952
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-03-24 12:56:31 -08:00
igor@rurik.mysql.com
69eb4e6932
Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-03-24 12:46:33 -08:00
igor@rurik.mysql.com
e99247775a
Fixed bug #17164 .
...
If the WHERE condition of a query contained an ORed FALSE term
then the set of tables whose rows cannot serve for null complements
in outer joins was determined incorrectly. It resulted in blocking
possible conversions of outer joins into joins for such queries.
2006-03-24 12:44:54 -08:00
dlenev@mysql.com
4d1d8ed335
Follow-up for the fix for bug #18153 "ALTER/OPTIMIZE/REPAIR on transactional
...
tables corrupt triggers".
It turned out that we also have relied at certain places that
(new_table != table_name) were always true on Windows and for transactional
tables. Since our fix for the bug brakes this assumption we have to add new
flag to pass this information around.
This code needs to be refactored but I dare not to do this in 5.0.
2006-03-24 22:46:33 +03:00
jonas@perch.ndb.mysql.com
427a471a47
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-24 18:52:31 +01:00
dlenev@mysql.com
3205f00449
Merge mysql.com:/home/dlenev/mysql-5.0-bg18153
...
into mysql.com:/home/dlenev/mysql-5.1-merges
2006-03-24 19:46:01 +03:00
tomas@poseidon.ndb.mysql.com
e11e6d8c7b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-24 17:46:00 +01:00
andrey@lmy004.
531ad766ed
fix for bug#16415 Events names are case sensitive
2006-03-24 17:45:52 +01:00
tomas@poseidon.ndb.mysql.com
3f22fced19
disabled test referring to bug
2006-03-24 17:41:26 +01:00
bpontz@shasta.mysql.com
4cdb80a855
Commented out lines in disabled.def that have bug numbers that are closed
2006-03-24 09:45:44 -05:00
dlenev@mysql.com
e5d5196586
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/mysql-5.0-bg18153
2006-03-24 16:46:37 +03:00
jonas@perch.ndb.mysql.com
1b967adfd0
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-24 14:21:45 +01:00
msvensson@neptunus.(none)
5a5afadcb4
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-24 13:56:05 +01:00
msvensson@neptunus.(none)
31e04d4571
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-24 13:55:10 +01:00
msvensson@neptunus.(none)
3dd641bd5c
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-24 13:50:41 +01:00
jonas@perch.ndb.mysql.com
dbe785a407
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-24 13:31:51 +01:00
mskold@mysql.com
1c6f8158f2
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-24 13:28:29 +01:00
dlenev@mysql.com
ec96a87912
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/mysql-5.0-bg18153
2006-03-24 15:28:08 +03:00
mskold@mysql.com
aa465e5b14
Enabled test rpl_ndb_insert_ignore
2006-03-24 13:26:35 +01:00
dlenev@mysql.com
891e9424f2
Fix for bug #18153 "ALTER/OPTIMIZE/REPAIR on transactional tables corrupt
...
triggers".
Applying ALTER/OPTIMIZE/REPAIR TABLE statements to transactional table or to
table of any type on Windows caused disappearance of its triggers.
Bug was introduced in 5.0.19 by my fix for bug #13525 "Rename table does not
keep info of triggers" (see comment for sql_table.cc for more info).
.
2006-03-24 14:58:18 +03:00
jonas@perch.ndb.mysql.com
038287aa9d
ndb autotest
...
fix \ in makefile (merge error)
2006-03-24 12:36:39 +01:00
msvensson@neptunus.(none)
ab1f95df3e
Merge 192.168.0.100:mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-24 12:33:11 +01:00
jonas@perch.ndb.mysql.com
2a12e49dd9
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-24 12:25:03 +01:00
knielsen@mysql.com
443ac64226
Improved fix for HPUX compile failure.
2006-03-24 12:24:31 +01:00
msvensson@shellback.(none)
6a6d305540
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-24 12:02:39 +01:00