Commit graph

19234 commits

Author SHA1 Message Date
mskold@mysql.com
d4c7c4ff5b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-01-26 11:34:18 +01:00
joreland@mysql.com
8f51f4f747 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-26 11:24:32 +01:00
joreland@mysql.com
f63c1120d0 ndb - make sure all used tables are dropped in beginning of test case 2005-01-26 11:23:43 +01:00
joreland@mysql.com
5b29c6eaaf Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-26 10:38:12 +01:00
joreland@mysql.com
04bffe101b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-26 10:35:20 +01:00
joreland@mysql.com
bff8064653 ndb - make sure all used tables are dropped in beginning of test case 2005-01-26 10:32:56 +01:00
patg@krsna.patg.net
7db99fa559 change to Makefile.am per Serg's request 2005-01-25 23:52:47 -08:00
joreland@mysql.com
93f87957ec Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-26 06:33:49 +01:00
marko@hundin.mysql.fi
81ce1c8d75 rem0rec.h:
Corrected formatting of comments.
rem0rec.ic:
  rec_set_info_and_status_bits(): pass arguments to rec_set_info_bits()
  in the correct order.
  Corrected formatting of comments.
2005-01-25 22:40:20 +02:00
joreland@mysql.com
08a9066110 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-25 20:25:40 +01:00
joreland@mysql.com
f461b4bcf1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-25 20:23:48 +01:00
joreland@mysql.com
1401be5ce4 merge 2005-01-25 20:22:53 +01:00
jani@ua141d10.elisa.omakaista.fi
4341ffda0e Some minor fixes. 2005-01-25 20:08:16 +02:00
jani@ua141d10.elisa.omakaista.fi
d77dc4f6a4 Merge 2005-01-25 18:35:11 +02:00
jani@ua141d10.elisa.omakaista.fi
d5f76d50f6 Some bug fixes and a feature add to mysql-test-run 2005-01-25 18:32:09 +02:00
mskold@mysql.com
1ba93bd46e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-01-25 17:03:28 +01:00
joreland@mysql.com
dd89b7bd4a Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-25 16:14:29 +01:00
joreland@mysql.com
ed32be8afc merge 2005-01-25 16:11:47 +01:00
joreland@mysql.com
81ac7a33c4 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-25 16:02:28 +01:00
joreland@mysql.com
fa4f07b81d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-25 15:57:08 +01:00
joreland@mysql.com
5e1bea84c8 ndb - Move mysql-test-run & testBackup into "basic suite" 2005-01-25 15:56:20 +01:00
konstantin@mysql.com
6c3a4aee18 Fix two typos in comments. 2005-01-25 17:25:46 +03:00
mskold@mysql.com
da658b9f11 Fix for failing INSERT IGNORE in test ndb_insert 2005-01-25 15:08:51 +01:00
jani@ua141d10.elisa.omakaista.fi
8a5316a425 Merge 4.1 -> 5.0 2005-01-25 15:24:04 +02:00
marko@hundin.mysql.fi
72de651ab5 One more after merge fix of Jan Lindström's changeset in 4.1 2005-01-25 14:49:30 +02:00
marko@hundin.mysql.fi
7eaec7eff7 After merge fixes 2005-01-25 14:44:34 +02:00
bar@mysql.com
d4a52f5f12 Makefile.am:
after merge fix
2005-01-25 16:29:24 +04:00
marko@hundin.mysql.fi
ee22415528 Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2005-01-25 14:17:51 +02:00
marko@hundin.mysql.fi
ea1bd1d5e5 InnoDB: Enable ut_ad() assertions in MySQL debug builds. 2005-01-25 14:16:41 +02:00
tomas@poseidon.ndb.mysql.com
1a94812b7b updated logevent example
added handling of Arbit log events
2005-01-25 13:08:21 +01:00
marko@hundin.mysql.fi
a698e5a0e1 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/j/mysql-5.0
2005-01-25 12:13:34 +02:00
marko@hundin.mysql.fi
fbb7d9a9df InnoDB: Write status bits to MLOG_COMP_REC_INSERT entries.
It is not safe to infer the status bits from the B-tree page
level, because after MLOG_COMP_LIST_END_COPY_CREATED, the
level will not be initialized before the records have been inserted.
(Bug #7973)
2005-01-25 12:10:24 +02:00
ram@gw.mysql.r18.ru
bb1fe73356 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
2005-01-25 13:39:19 +04:00
tomas@poseidon.ndb.mysql.com
51def113d8 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-25 10:17:54 +01:00
tomas@poseidon.ndb.mysql.com
89359d59db Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-25 10:06:09 +01:00
ram@gw.mysql.r18.ru
3350a7ec6d Merge gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
2005-01-25 13:05:15 +04:00
tomas@poseidon.ndb.mysql.com
b74ddc6aaf Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-25 10:05:14 +01:00
tomas@poseidon.ndb.mysql.com
1baa14bbe1 backported ndb_mgm options from 5.0
changed ndb_restore test somewhat to fisrt make the tables in myisam
2005-01-25 10:03:27 +01:00
tomas@poseidon.ndb.mysql.com
98fbdecc7b Merge 2005-01-25 09:53:39 +01:00
tomas@poseidon.ndb.mysql.com
7b3ec51deb fix for make error in Makefile.am of mysql_client_test.c 2005-01-25 09:47:00 +01:00
tomas@poseidon.ndb.mysql.com
568af049f7 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-25 09:02:21 +01:00
ram@gw.mysql.r18.ru
8c043a299b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
2005-01-25 11:06:12 +04:00
ram@gw.mysql.r18.ru
35b521c925 Test case (bug #7261: Alter table loses temp table with lower_case_table_names=2). 2005-01-25 10:58:30 +04:00
tomas@poseidon.ndb.mysql.com
866182d35b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-25 07:23:07 +01:00
jan@hundin.mysql.fi
c5a0ef7386 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-01-25 08:00:23 +02:00
sergefp@mysql.com
3822eeb972 Fix for BUG#8003 attempt 2:
Call file->external_lock() for handler objects that index_merge code creates in addition to 
  the handler object opened in open_and_lock_tables.
2005-01-25 07:37:06 +03:00
konstantin@mysql.com
013a6f50c2 Merge mysql.com:/home/kostja/work/mysql-4.1-5787
into mysql.com:/home/kostja/work/mysql-5.0-root
2005-01-25 02:54:17 +03:00
jimw@mysql.com
7454f2f097 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-24 15:39:41 -08:00
konstantin@mysql.com
4a7fd21f12 A fix for Bug#5787 "mysql_stmt_prepare is upto 8 times slower":
it's crucial to disable Nagle algorithm on client for no-reply commands
(like mysql_stmt_free) to always work fast.
Nagle algorithm instructs the sender to buffer (store) data if any 
unacknowledged data is outstanding and the size of to-send data is less than
the network segment. It was exactly the case with COM_STMT_CLOSE after 
COM_STMT_PREPARE, so the client was waiting for Nagle timer to expire or
 for ACK from the server, while the server was holding up ACK because of 
delayed acknowledgement algorithm.
The tricky part is that we have been already disabling Nagle 
algorithm (by setting TCP_NODELAY)
almost everywhere except Windows (and maybe Netware).
It is the reason why the bug was repeatable only with Windows client.
2005-01-25 02:31:51 +03:00
jimw@mysql.com
d11081bd6f Merge 2005-01-24 13:48:48 -08:00