Commit graph

20133 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
19cc402624 Fix uninitialised variable in Dbacc 2005-03-10 10:46:19 +01:00
msvensson@neptunus.(none)
c94952d1f0 Removed unused variable 2005-03-10 10:43:11 +01:00
msvensson@neptunus.(none)
c4f1804d9c Manual merge 2005-02-22 11:19:41 +01:00
msvensson@neptunus.(none)
e7cfb0f6a6 Fix name of ndb-cache-check-time 2005-02-22 10:59:24 +01:00
joreland@mysql.com
8195e44c9c Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-22 10:23:24 +01:00
joreland@mysql.com
df22808b02 wl1292 - ndb autotest scripts
split into script/conf for easier deployment
2005-02-22 10:18:38 +01:00
serg@serg.mylan
82571d6b84 MYSQL_LOG::recover was trying to allocate 0 bytes - bug#8661 2005-02-22 00:43:37 +01:00
serg@serg.mylan
178be07aa3 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-22 00:17:56 +01:00
serg@serg.mylan
b43029f4eb bug#8646 - deadlock if long transaction causes binlog rotate 2005-02-22 00:15:31 +01:00
tulin@mysql.com
d863b8951d corrected errors in how ndbcluster handler closes down in case of error 2005-02-21 23:29:07 +01:00
mysqldev@mysql.com
5d1fff6a24 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 23:05:13 +01:00
tomas@poseidon.ndb.mysql.com
3da84d4394 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-21 23:05:12 +01:00
monty@mysql.com
e70b1c18ca Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-21 20:42:34 +02:00
monty@mysql.com
f5acf0be01 Generate warning in ha_delete_table() if files is missing in handler 2005-02-21 20:41:48 +02:00
tomas@poseidon.ndb.mysql.com
d6188f9fd2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-21 19:11:11 +01:00
msvensson@neptunus.(none)
7ddddc719d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-02-21 17:54:06 +01:00
heikki@hundin.mysql.fi
592ad32c74 ha_innodb.cc:
Fix crash reported by Pekka Nousiainen if skip-innodb: do not try to release InnoDB's temporary latches if InnoDB has not been inited
2005-02-21 18:54:06 +02:00
hf@deer.(none)
518dc54a4f Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-21 20:54:05 +04:00
hf@deer.(none)
b5926f1d51 Fix for bug #8651 (cast(sum(distinct) as decimal) crashes the server) 2005-02-21 20:50:56 +04:00
serg@serg.mylan
d1be376519 show automatic commits in general log 2005-02-21 16:28:05 +01:00
mysqldev@mysql.com
0ffb4c21a1 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 16:23:05 +01:00
monty@mysql.com
4feff48d9d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-21 17:23:05 +02:00
serg@serg.mylan
5a333a3b14 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-21 16:23:04 +01:00
hf@deer.(none)
f7b5ef47b1 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-21 19:23:03 +04:00
hf@deer.(none)
803ed1a116 Tests modified to coved decimal-related code 2005-02-21 19:20:05 +04:00
mysqldev@mysql.com
1a233ed968 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 15:07:27 +01:00
pem@mysql.com
9376231fb4 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-02-21 15:04:41 +01:00
ramil@mysql.com
d2f8149861 Cleanup. 2005-02-21 18:03:06 +04:00
pem@mysql.comhem.se
d88fa42cab A minor adjustment of the previous bug fix in sp_head.cc.
(Which btw also fixed BUG#7295: Server crash when executing stored procedure,
 I just forgot to include that before.)
2005-02-21 14:57:43 +01:00
ramil@mysql.com
d8bd293bf6 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0
2005-02-21 17:38:37 +04:00
msvensson@neptunus.(none)
b4417c7572 Fix so that ndb-cache-check-time is measured in milliseconds 2005-02-21 14:04:54 +01:00
serg@serg.mylan
dc338e5b5c workaround for sun compiler on sol9x86 2005-02-21 14:04:35 +01:00
msvensson@neptunus.(none)
1666f99b14 Fix compiler warning/crash(ds20) 2005-02-21 14:01:36 +01:00
ramil@mysql.com
39f497b9dd Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0
2005-02-21 16:53:00 +04:00
monty@mysql.com
3b1f0964c1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-21 14:48:44 +02:00
monty@mysql.com
cab35adf7e Review of new pushed code (XA & other)
Portability fixes and cleanups
Fixed setting of 'res' in mysql_execute_command()
2005-02-21 14:47:57 +02:00
mysqldev@mysql.com
d35da42a48 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 13:39:29 +01:00
ramil@mysql.com
a290359477 A fix (bug #7661: 'classic' shows different test effects which must be cared for)
"create table ta(a bit...) engine=innodb" moved to innodb.test
2005-02-21 16:39:13 +04:00
mysqldev@mysql.com
c52f9d37d4 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 12:24:28 +01:00
serg@serg.mylan
fcb135560d Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-21 11:57:06 +01:00
serg@serg.mylan
b75d8ac0f3 xa assert fixes 2005-02-21 11:51:50 +01:00
joreland@mysql.com
a467157878 ndb - ndb_multi - reset query cache at end of test 2005-02-21 11:45:51 +01:00
mysqldev@mysql.com
1e14ba287a Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 10:55:21 +01:00
joreland@mysql.com
b6e20e350f ndb - fix problems introduced/discovered by XA 2005-02-21 10:53:19 +01:00
mysqldev@mysql.com
94fb790b18 Merge mysql.com:/home/mysqldev/tulin/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 10:53:01 +01:00
tulin@mysql.com
84f0f11fff bug #8611, ndb includes in lib dir instead of include dir 2005-02-21 10:52:29 +01:00
joreland@mysql.com
9f1f8d3249 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-21 06:56:26 +01:00
petr@mysql.com
bacdd62fb9 Fix confusing comments. 2005-02-20 22:52:28 +03:00
serg@serg.mylan
1bc6ae8913 portability fixes 2005-02-20 20:08:33 +01:00
serg@serg.mylan
6904398874 decimal format documented 2005-02-20 17:25:22 +01:00