Commit graph

15939 commits

Author SHA1 Message Date
monty@mysql.com
e9c3887b58 After merge fixes 2004-11-12 17:44:17 +02:00
serg@serg.mylan
e20732b073 typos in error messages fixed 2004-11-12 16:41:53 +01:00
paul@ice.snake.net
1288f453cc fill_help_tables.sh:
Recognize another Texinfo tag.
2004-11-12 08:45:58 -06:00
paul@ice.snake.net
d927503a96 mysqldump.c:
Add missing sentinel.
2004-11-12 07:13:46 -06:00
joreland@mysql.com
3029bbdb24 wl1744 - recommit stuff lost in corrupt clone 2004-11-12 10:59:00 +01:00
monty@mysql.com
9252656d49 merge with 4.0 2004-11-12 11:17:53 +02:00
ram@gw.mysql.r18.ru
77fe1baf1d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6564
2004-11-12 12:38:07 +04: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
monty@mysql.com
bfe2917f89 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-11-12 10:22:15 +02:00
joreland@mysql.com
ad4d7a655f wl1744 - more script fixes 2004-11-12 09:18:26 +01:00
joreland@mysql.com
c37d079c12 wl1744 - ndb on windoze 2004-11-12 08:48:31 +01:00
joreland@mysql.com
64f7965d80 wl1744 - ndb win port
improve ndb_global.h
2004-11-11 22:39:24 +01:00
joreland@mysql.com
37e92ab27a Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl1744
2004-11-11 22:02:17 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
2ad7d5c662 Bug#6123 - GRANT USAGE creates useless mysql.db row
Prevent creation of a row which grants no rights
  Test included
2004-11-11 20:59:03 +00: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
joreland@mysql.com
4f2ba8e9f9 wl1744 - ndb win-port 2004-11-11 21:38:42 +01: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
joreland@mysql.com
6600cd3ef9 wl1744 - ndb on windoze 2004-11-11 21:25:55 +01:00
heikki@hundin.mysql.fi
38cae36c87 trx0purge.c:
Remove duplicated innodb max purge lag code
2004-11-11 21:17:44 +02: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
jani@a80-186-24-72.elisa-laajakaista.fi
54dac2cfac Some code clean-up and optimization. 2004-11-11 16:59:36 +02:00
ram@gw.mysql.r18.ru
98df9313c0 A fix (bug #6564: QUOTE(NULL) returns NULL, not the string 'NULL') 2004-11-11 18:20:40 +04:00
jani@a80-186-24-72.elisa-laajakaista.fi
4f04217879 Removed check for .ini file elsewhere, except on Windows. 2004-11-11 16:20:39 +02:00
monty@mysql.com
7c9b83fc92 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-11-11 15:22:34 +02:00
tomas@poseidon.ndb.mysql.com
e0a3e48f7e forgot a return 0
removed some errorcodes not used
2004-11-11 13:22:33 +00:00
monty@mysql.com
20eb74dcda Write fatal errors even if silent is used in client_test 2004-11-11 14:59:13 +02: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
joreland@mysql.com
02209bb010 wl1744- ndb windows
move ports into ndb_global
2004-11-11 08:15:52 +01: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
joreland@mysql.com
b2ff852c62 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl1744
2004-11-10 21:53:21 +01:00
joreland@mysql.com
d575af60fd Merge mysql.com:/home/jonas/src/wl1744
into mysql.com:/home/jonas/src/fix
2004-11-10 21:51:10 +01:00
joreland@mysql.com
b6c44a2960 wl1744 - ndb windows port
move versing handling into ndb_version.h.in (from config.h)
2004-11-10 21:43:12 +01:00
Administrator@w2k.
0ee744dcb1 wl1744 - ndb windoze port 2004-11-10 21:31:41 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
b6272b85fd Bug#6469 - REVOKE ALL synonymy bug 2004-11-10 18:53:16 +00:00