Commit graph

15780 commits

Author SHA1 Message Date
matthias@three.local.lan
a00cb55dae Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-11-12 10:40:02 +01:00
ram@gw.mysql.r18.ru
ec025721bd Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6551
2004-11-12 12:36:42 +04:00
paul@kite-hub.kitebird.com
8c2f17d1d8 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-11-11 14:56:44 -06:00
paul@kite-hub.kitebird.com
af8d361217 mysqldump.c:
Reorder options, revise --hex-blob help string.
2004-11-11 14:55:55 -06:00
serg@serg.mylan
0be3c55594 mi_write: fix for ft2 when found word (in the tree) has different length as the word to insert 2004-11-11 21:26:24 +01:00
heikki@hundin.mysql.fi
38cae36c87 trx0purge.c:
Remove duplicated innodb max purge lag code
2004-11-11 21:17:44 +02:00
mleich@mysql.com
3c0a2c0f31 Result of
WL#2225 Extend the test cases for PS + develop a basic test routine for PS
   The basic test routine 
       mysql-test/include/patchwork-check.inc
   Test cases for the the basic test routine 
       mysql-test/t/tool_test.test    
       mysql-test/r/tool_test.result

   Test cases for prepared statements with functions
       mysql-test/t/ps_12func.test
       mysql-test/r/ps_12func.result
   Some statements are set to comment, because of open bugs.

Fresh MySQL V4.1 and V5.0 souces produce in the moment (~11-Nov-2004) the
same result files.
2004-11-11 20:12:12 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
6f39bf2b9c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6469
2004-11-11 17:12:25 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
e0527b1750 Merge pcgem.rdg.cyberkinetica.com:/mnt/staff/repositories/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6469
2004-11-11 17:07:57 +00:00
tomas@poseidon.ndb.mysql.com
09ee973411 ndb_test_platform.cpp:
better printouts in ndb_test_platform
2004-11-11 16:51:38 +00:00
tomas@poseidon.ndb.mysql.com
37d1b4ecd5 waiter.cpp:
fixed so that connectring option works
2004-11-11 16:38:15 +00:00
tomas@poseidon.ndb.mysql.com
33bb73da67 mysql-test-run.sh:
made sleep time for second master larger so that it has time to start
2004-11-11 16:06:47 +00:00
tomas@poseidon.ndb.mysql.com
399ad08e4f basestring_vsnprintf fix for size==0 2004-11-11 15:53:33 +00:00
tomas@poseidon.ndb.mysql.com
e0a3e48f7e forgot a return 0
removed some errorcodes not used
2004-11-11 13:22:33 +00:00
tomas@poseidon.ndb.mysql.com
fd39778fcf ndbcluster.sh:
fixed typo
2004-11-11 11:08:37 +00:00
tomas@poseidon.ndb.mysql.com
8b0101a0d7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-11 10:31:34 +00:00
tomas@poseidon.ndb.mysql.com
6a9cbe487e added ndb error codes and better explanations 2004-11-11 10:05:28 +00:00
guilhem@mysql.com
5d35cc0d8e Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-11-11 10:25:28 +01:00
guilhem@mysql.com
91a40d4220 Fix for autobuild failure: forgotten ';' (bison 1.875 accepts if it's not there, but 1.75 does not) 2004-11-11 10:24:16 +01:00
ram@gw.mysql.r18.ru
1d967b8dcf A fix (bug #6551: UMASK_DIR & UMASK not taken into account (mysqld.cc my_init.c inconsistency)).
my_umask and my_umask_dir initialization has been moved to the my_init() func.
2004-11-11 12:35:55 +04:00
ram@gw.mysql.r18.ru
582f9a8900 Added ending ';' for the start_transaction_opts: 2004-11-11 10:50:46 +04:00
paul@ice.snake.net
9ee3bf9efa fill_help_tables.sh:
Handle some additional Texinfo tags that were being missed.
2004-11-10 22:43:09 -06:00
guilhem@mysql.com
f9a51b66ae Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-11-11 00:27:34 +01:00
guilhem@mysql.com
09da85338c no new message in 4.1 (causes merge issues with 5.0). Using ER_UNKNOW_ERROR and hardcoded message string instead. 2004-11-11 00:00:17 +01:00
monty@mysql.com
7d78fd077a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-11-11 00:36:56 +02:00
monty@mysql.com
68130e428a Added possibility to detect if libmysqld is restarted
(Needed to check if memory allocated with mysql_once_init() has been freed)
2004-11-11 00:36:18 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
b6272b85fd Bug#6469 - REVOKE ALL synonymy bug 2004-11-10 18:53:16 +00:00
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
monty@mysql.com
e76438e807 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-11-10 18:08:32 +02:00
monty@mysql.com
c7e85ef9b9 More debugging
Print position in normal log for Binlog dump
2004-11-10 18:07:39 +02: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
monty@mysql.com
e9d9ca83f1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-11-10 13:08:22 +02: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
monty@mysql.com
3d0f7eca4e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-11-09 21:45:36 +02: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