kent@mysql.com
9d2c6089f4
Merge mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/users/kboortz/daily/work/mysql-4.1-wax
2004-11-10 19:37:55 +01:00
guilhem@mysql.com
600b965f32
Merge
2004-11-10 18:02:00 +01:00
guilhem@mysql.com
6cd218cc56
WL#1596 "make mysqldump --master-data --single-transaction able to do online dump of InnoDB AND report reliable
...
binlog coordinates corresponding to the dump".
The good news is that now mysqldump can be used to get an online backup of InnoDB *which works for
point-in-time recovery and replication slave creation*. Formerly, mysqldump --master-data --single-transaction
used to call in fact mysqldump --master-data, so the dump was not an online dump (took big lock all time of dump).
The only lock which is now taken in this patch is at the beginning of the dump: mysqldump does:
FLUSH TABLES WITH READ LOCK; START TRANSACTION WITH CONSISTENT SNAPSHOT; SHOW MASTER STATUS; UNLOCK TABLES;
so the lock time is in fact the time FLUSH TABLES WITH READ LOCK takes to return (can be 0 or very long, if
a table is undergoing a huge update).
I have done some more minor changes listed in the paragraph of mysqldump.c.
WL#2237 "WITH CONSISTENT SNAPSHOT clause for START TRANSACTION":
it's a START TRANSACTION which additionally starts a consistent read on all
capable storage engine (i.e. InnoDB). So, can serve as a replacement for
BEGIN; SELECT * FROM some_innodb_table LIMIT 1; which starts a consistent read too.
2004-11-10 17:56:45 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
3eb817a821
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6031
2004-11-10 16:05:58 +00:00
tomas@poseidon.ndb.mysql.com
8f408a18de
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-10 16:05:57 +00:00
tomas@poseidon.ndb.mysql.com
17b2d671ee
added configure switch for ndb port number
...
added new variable for ndb port 1186
changed meaning of ndb_port_base to be default tcp port setting
changed to use split between port and port_base for ndbcluster
so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
added larger space to pid print
moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
added c-api to Ndb_mgmclient
pass also ndb_port to make
2004-11-10 16:05:28 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
dd1cd8aa46
Bug#6031 - To drop database you have to execute DROP DATABASE command twice.
...
DROP DATABASE failed because of file ext not in TYPELIB of known extensions.
General solution - construct a TYPELIB at runtime instead of a static list.
2004-11-10 15:07:11 +00:00
bar@mysql.com
f08a29d85a
Adding new function prototype
2004-11-10 14:13:38 +04:00
bar@mysql.com
a63d8fa554
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1
2004-11-10 14:09:38 +04:00
bar@mysql.com
55c4c39571
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1
2004-11-10 14:07:11 +04:00
wax@mysql.com
fa339b3fd8
Merge mysql.com:/home/wax/mysql/mysql-4.1
...
into mysql.com:/home/wax/mysql/mysql-4.1mysqltest
2004-11-10 15:05:39 +05:00
bar@mysql.com
c51d7acfcc
1. When mixing NULL to a character string,
...
the result takes its charset/collation
attributes from the character string,
e.g. SELECT func(NULL, _latin2'string')
now returns a latin2 result. This is
done by introducing a new derivation
(aka coercibility) level DERIVATION_IGNORABLE,
which is used with Item_null.
2. 'Pure' NULL is now BINARY(0), not CHAR(0).
I.e. NULL is now more typeless.
2004-11-10 14:05:28 +04:00
wax@kishkin.ru
ee3e815e3b
replaced init_db.sql
2004-11-10 15:03:59 +05:00
joreland@mysql.com
aeafd88e19
bug#6538
...
ndb: Fix return value in index_last wo/ rows
2004-11-10 11:02:51 +01:00
tomas@poseidon.ndb.mysql.com
f0e4686d3d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-10 07:45:28 +00:00
joreland@mysql.com
2f50044794
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-10 00:00:25 +01:00
tomas@poseidon.ndb.mysql.com
07f9f38cf8
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-09 19:40:04 +00:00
tomas@poseidon.ndb.mysql.com
761bee8647
added management function to purge stale sessions in the management server
2004-11-09 19:39:29 +00:00
kent@mysql.com
41c58b13a1
Merge mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/users/kboortz/daily/work/mysql-4.1-wax
2004-11-09 20:22:38 +01:00
kent@mysql.com
fd3ec9ca01
mysql_test_run_new.c, my_manage.h, my_manage.c:
...
Added Solaris compatibility
2004-11-09 20:21:37 +01:00
lars@mysql.com
c865cd2995
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/bkroot/mysql-4.1
2004-11-09 17:33:09 +01:00
heikki@hundin.mysql.fi
d7eecc803d
dict0dict.ic:
...
Fix a bug in InnoDB code that fortunately was never used: row id is stored in a record always as a 6-byte unsigned integer, in a 'non-compressed' form
2004-11-09 15:59:45 +02:00
joreland@mysql.com
a889fc4684
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-09 12:00:50 +01:00
joreland@mysql.com
d6860f8502
ndb: compile fix for hpita2-64 bit - remove a bunch of includes
2004-11-09 11:59:28 +01:00
lars@mysql.com
0fb9cfc974
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/bkroot/mysql-4.1
2004-11-09 09:36:34 +01:00
monty@mysql.com
6c44563fc5
Simple optimization
2004-11-09 03:20:58 +02:00
monty@mysql.com
81363b194d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-11-09 00:22:26 +02:00
guilhem@mysql.com
0517e7b22d
As rollback can be 30 times slower than insert in InnoDB, and user may
...
not know there's rollback (if it's because of a dupl row), better warn
that it's happening. It can also be of use for a DBA killing a
connection and wondering what this connection is still doing now. Example:
| 5 | root | localhost | test | Killed | 10 | Rolling back | insert into i select * from j |
2004-11-08 21:45:23 +01:00
tomas@poseidon.ndb.mysql.com
9b7ea44b26
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-08 14:07:37 +00:00
tomas@poseidon.ndb.mysql.com
17de85dfa6
added ndb test platform test
2004-11-08 13:33:10 +00:00
joreland@mysql.com
ffaa063659
compile fix for ndbapi test program on irix (variable scope)
2004-11-08 13:59:04 +01:00
lars@mysql.com
3e3cac142e
Merge mysql.com:/home/bkroot/mysql-4.1
...
into mysql.com:/home/bk/b6239-4.1-v2-pending
2004-11-08 13:45:42 +01:00
joreland@mysql.com
98e6ddfe4a
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-08 12:45:31 +01:00
tomas@poseidon.ndb.mysql.com
83581c369f
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-08 11:29:45 +00:00
tomas@poseidon.ndb.mysql.com
eea1b83b20
Makefile.am:
...
fix to make make -jN work
2004-11-08 11:28:57 +00:00
joreland@mysql.com
04c8621390
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-08 11:53:50 +01:00
bar@mysql.com
a11dba7bab
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1
2004-11-08 14:53:49 +04:00
tomas@poseidon.ndb.mysql.com
3f38389905
Makefile.am:
...
added so that it is possible to make mysql_test_run_new
but not done for target all do:
make mysql_test_run_new
2004-11-08 10:53:48 +00:00
tomas@poseidon.ndb.mysql.com
f3cd21dbb3
Makefile.am:
...
remove mysql_test_run_new for now, it breaks the make
2004-11-08 10:41:59 +00:00
tomas@poseidon.ndb.mysql.com
f5b373d678
Makefile.am:
...
changed make order
.del-Makefile_old~dde91b00b37d2a06:
Delete: ndb/tools/Makefile_old
.del-Makefile_old~70d769657921a760:
Delete: ndb/test/tools/Makefile_old
.del-Makefile_old~58f0559822147dd9:
Delete: ndb/test/tools/old_dirs/waiter/Makefile_old
.del-Makefile_old~4fdb3c92ebd2eb29:
Delete: ndb/test/run-test/Makefile_old
.del-Makefile_old~1497f81a0c2125e:
Delete: ndb/test/src/Makefile_old
.del-Makefile_old~fbd3934fabdfe550:
Delete: ndb/test/ndbapi/Makefile_old
.del-Makefile_old~ec8e48326d4aa09:
Delete: ndb/test/ndbapi/old_dirs/flexBench/Makefile_old
.del-Makefile_old~1046c9ce93ef1fb8:
Delete: ndb/test/ndbapi/bank/Makefile_old
.del-Makefile_old~7c98d8f1d275983f:
Delete: ndb/src/ndbapi/Makefile_old
.del-Makefile_old~4463cf06fc2fceb9:
Delete: ndb/src/mgmapi/Makefile_old
.del-Makefile_old~274925c960801993:
Delete: ndb/src/mgmsrv/Makefile_old
.del-Makefile_old~b3d33fdde8bc12c0:
Delete: ndb/src/kernel/Makefile_old
.del-Makefile_old~6dbe2defc7237d4d:
Delete: ndb/src/kernel/vm/Makefile_old
.del-Makefile_old~cf05571c99011360:
Delete: ndb/src/kernel/error/Makefile_old
.del-Makefile_old~29a955a7e17d650e:
Delete: ndb/src/kernel/blocks/Makefile_old
.del-Makefile_old~f8b2a47eb434d43:
Delete: ndb/src/kernel/blocks/suma/Makefile_old
.del-Makefile_old~f0c05bb23d5c23ca:
Delete: ndb/src/kernel/blocks/grep/Makefile_old
.del-Makefile_old~a6fd2e579249f6e0:
Delete: ndb/src/kernel/blocks/ndbcntr/Makefile_old
.del-Makefile_old~7e8d8b4e2b1fa8f7:
Delete: ndb/src/kernel/blocks/ndbfs/Makefile_old
.del-Makefile_old~73c174fc712803c5:
Delete: ndb/src/kernel/blocks/qmgr/Makefile_old
.del-Makefile_old~16de31311951fc04:
Delete: ndb/src/kernel/blocks/trix/Makefile_old
.del-Makefile_old~788c80e5e758ac7:
Delete: ndb/src/kernel/blocks/dbutil/Makefile_old
.del-Makefile_old~5ebf2b4f85ab09cf:
Delete: ndb/src/kernel/blocks/dbtux/Makefile_old
.del-Makefile_old~530f9e0bc038a62:
Delete: ndb/src/kernel/blocks/dbtup/Makefile_old
.del-Makefile_old~315b927180484020:
Delete: ndb/src/kernel/blocks/dbtc/Makefile_old
.del-Makefile_old~d013a228cad86ba0:
Delete: ndb/src/kernel/blocks/dbacc/Makefile_old
.del-Makefile_old~c2e33f043b8aa45e:
Delete: ndb/src/kernel/blocks/cmvmi/Makefile_old
.del-Makefile_old~bdf406f5fb4696cb:
Delete: ndb/src/kernel/blocks/dblqh/Makefile_old
.del-Makefile_old~38a24016d2ad8aa7:
Delete: ndb/src/kernel/blocks/dbdict/Makefile_old
.del-Makefile_old~2804044250a6fd91:
Delete: ndb/src/kernel/blocks/dbdih/Makefile_old
.del-Makefile_old~e58eec87cd8dc79e:
Delete: ndb/src/cw/Makefile_old
.del-Makefile_old~b50c85b8eb69aacb:
Delete: ndb/src/kernel/blocks/backup/Makefile_old
.del-Makefile_old~16e186623106985e:
Delete: ndb/src/cw/cpcd/Makefile_old
.del-Makefile_old~f03f74238d640d5:
Delete: ndb/src/common/mgmcommon/Makefile_old
.del-Makefile_old~a8e9765b520b7c68:
Delete: ndb/src/common/util/Makefile_old
.del-Makefile_old~9f275aed83c8652b:
Delete: ndb/src/common/transporter/Makefile_old
.del-Makefile_old~8d901a664eca1ec:
Delete: ndb/src/common/portlib/Makefile_old
.del-Makefile_old~19643559613c75c7:
Delete: ndb/src/common/portlib/old_dirs/unix/Makefile_old
.del-Makefile_old~a3f6fc0e1411bb28:
Delete: ndb/src/common/logger/Makefile_old
.del-Makefile_old~754f27fab7d4da3b:
Delete: ndb/src/common/debugger/signaldata/Makefile_old
.del-Makefile_old~54ca8df95719e59f:
Delete: ndb/src/common/debugger/Makefile_old
2004-11-08 10:35:23 +00:00
tomas@poseidon.ndb.mysql.com
8eeca90b1d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-08 10:30:00 +00:00
joreland@mysql.com
9d8dcdcf72
Merge mysql.com:/home/jonas/src/new-fix
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-08 11:26:34 +01:00
joreland@mysql.com
ddff854b90
Merge mysql.com:/home/jonas/src/kalle
...
into mysql.com:/home/jonas/src/new-fix
2004-11-08 11:24:08 +01:00
bar@mysql.com
ed807c29c9
alter_table.result, alter_table.test, field_conv.cc:
...
Bug #6479 ALTER TABLE ... changing charset fails for TEXT columns
Fix: use do_conv_blob rather than do_copy_blob
if the column's character sets are different.
2004-11-08 14:23:14 +04:00
tomas@poseidon.ndb.mysql.com
9f999953a2
removed editline and replaced with mysql readline
...
created new facade object for CommandInterpreter
removed CPC #if 0 code
removed editline from mgmtsrver, no replace with readline since interface is obsolete anyways
2004-11-08 10:21:39 +00:00
joreland@mysql.com
3821a8dfca
ndb: bug#6435
...
fix null handling in ha_ndbcluster when using ordered index
2004-11-08 11:11:49 +01:00
joreland@mysql.com
8acbd6a2ba
ndb: bug#6451
...
1) fix so that missing blob tables don't prevent table from being
dropped
2) decrease size of blob part if record length exceeds max length
3) add test case for table wo/ corresponding blob table
4) init scan counters when sending scan_tabreq
2004-11-08 11:06:36 +01:00
bar@mysql.com
b7776f83e7
ctype_ujis.result, ctype_ujis.test, field.cc:
...
Bug#6345 Unexpected behaviour with partial indices
2004-11-08 13:15:01 +04:00
monty@mysql.com
4fbf62e6c2
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-11-08 01:15:26 +02:00
monty@mysql.com
b903a129e2
Simpler arena swapping code
...
Now thd->mem_root is a pointer to thd->main_mem_root and THR_MALLOC is a pointer to thd->mem_root.
This gives us the following benefits:
- Allow us to easily detect if arena has already been swapped before (this fixes a bug in setup_conds() where arena was swaped twice in some cases)
- Faster swaps of arenas (as we don't have to copy the whole MEM_ROOT)
- We don't anymore have to call my_pthread_setspecific_ptr(THR_MALLOC,...) to change where memory is alloced. Now it's enough to set thd->mem_root
2004-11-08 01:13:54 +02:00