tomas@poseidon.ndb.mysql.com
|
e8f2b13482
|
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
|
2005-02-18 14:55:52 +01:00 |
|
kent@mysql.com
|
34e7e98a45
|
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
|
2005-02-18 14:55:32 +01:00 |
|
serg@serg.mylan
|
b68514ddd1
|
after-merge fix
|
2005-02-18 14:53:23 +01:00 |
|
serg@serg.mylan
|
262dd182ef
|
compilation fixes
|
2005-02-18 14:42:14 +01:00 |
|
kent@mysql.com
|
3f218b85cf
|
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
|
2005-02-18 14:37:24 +01:00 |
|
kent@mysql.com
|
d94b8662f4
|
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
|
2005-02-18 14:21:00 +01:00 |
|
mats@mysql.com
|
0ad02a920c
|
Merge from 4.0
|
2005-02-18 14:19:08 +01:00 |
|
serg@serg.mylan
|
e1beaeac17
|
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
|
2005-02-18 13:57:54 +01:00 |
|
mats@mysql.com
|
d0f1b5f3fd
|
Merge mysql.com:/home/bkroot/mysql-4.0
into mysql.com:/home/bk/b7879-mysql-4.0
|
2005-02-18 13:50:19 +01:00 |
|
serg@serg.mylan
|
1235e6d2c7
|
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
|
2005-02-18 13:38:10 +01:00 |
|
msvensson@neptunus.(none)
|
3369b65931
|
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
|
2005-02-18 13:31:28 +01:00 |
|
msvensson@neptunus.(none)
|
f454fc8a6c
|
BUG#8585 ndb_cache fails on aix52
|
2005-02-18 13:29:27 +01:00 |
|
serg@serg.mylan
|
f71006f996
|
Merge bk-internal:/home/bk/mysql-5.0-xa
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
|
2005-02-18 13:17:22 +01:00 |
|
bar@mysql.com
|
6ef93274b0
|
Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0.fresh
|
2005-02-18 16:14:28 +04:00 |
|
bar@mysql.com
|
47b85939a5
|
Bug #7878 with utf_general_ci, equals (=) has problem with accent insensitivity
Backporting Monty's fix for 5.0 into 4.1.
|
2005-02-18 16:10:12 +04:00 |
|
hf@deer.(none)
|
68a1ba2562
|
Merge deer.(none):/home/hf/work/mysql-4.1.clean
into deer.(none):/home/hf/work/mysql-5.0.clean
|
2005-02-18 15:57:39 +04:00 |
|
mskold@mysql.com
|
ed53a37b02
|
Added NULL initilizers for commit_by_xid and rollback_by_xid in hton struct. Changed back table->in_use to current_thd.
|
2005-02-18 12:53:43 +01:00 |
|
hf@deer.(none)
|
8b2fc991cd
|
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
|
2005-02-18 15:52:59 +04:00 |
|
hf@deer.(none)
|
93e0107050
|
Fix for the bug #7344 (multiple server_init/server_end lead to crash)
Some variable wasn't moved to the initial state during mysql_server_end
|
2005-02-18 15:51:55 +04:00 |
|
serg@serg.mylan
|
c0dda01f76
|
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
|
2005-02-18 12:02:46 +01:00 |
|
msvensson@neptunus.(none)
|
3d0883bb05
|
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-8583
|
2005-02-18 11:02:21 +01:00 |
|
msvensson@neptunus.(none)
|
4ebbb92054
|
BUG#8583 ndb_...multi tests fail in 5.0.3
- the variable MASTER_MY_PORT1 was used from the script, but it was not set to the port where the second server was started
|
2005-02-18 10:57:10 +01:00 |
|
bar@mysql.com
|
dcb0f52e9a
|
Merge: don't add this into configure in as it is already in
config/ac-macros/character_sets.m4
|
2005-02-18 13:21:30 +04:00 |
|
bar@mysql.com
|
fe8c9e498e
|
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0.fresh
|
2005-02-18 13:16:17 +04:00 |
|
bar@mysql.com
|
c926e43f65
|
A way not to compile UCA collations
|
2005-02-18 12:58:16 +04:00 |
|
jimw@mysql.com
|
e9a5b7d500
|
Clean up merge from 4.1, including making several enum fields
in the grant tables case-insensitive and updating test results.
|
2005-02-17 18:07:14 -08:00 |
|
jimw@mysql.com
|
7eb8c130f7
|
Merge
|
2005-02-17 16:16:58 -08:00 |
|
jimw@mysql.com
|
613e09a92a
|
Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
|
2005-02-17 15:58:45 -08:00 |
|
jimw@mysql.com
|
3c700572b4
|
Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
|
2005-02-17 15:23:28 -08:00 |
|
acurtis@pcgem.rdg.cyberkinetica.com
|
36c146c732
|
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.3
|
2005-02-17 21:57:36 +00:00 |
|
jimw@mysql.com
|
e3ff1bf326
|
Merge mysql.com:/home/jimw/my/mysql-4.1-8303
into mysql.com:/home/jimw/my/mysql-4.1-clean
|
2005-02-17 13:54:05 -08:00 |
|
jimw@mysql.com
|
9de31feab9
|
Merge mysql.com:/home/jimw/my/mysql-4.1-7617
into mysql.com:/home/jimw/my/mysql-4.1-clean
|
2005-02-17 13:53:35 -08:00 |
|
jimw@mysql.com
|
219e29d7ae
|
Merge mysql.com:/home/jimw/my/mysql-4.1-8471
into mysql.com:/home/jimw/my/mysql-4.1-clean
|
2005-02-17 13:53:07 -08:00 |
|
acurtis@pcgem.rdg.cyberkinetica.com
|
4b4a5659df
|
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.3
|
2005-02-17 21:53:05 +00:00 |
|
serg@serg.mylan
|
3f7355dfef
|
making XA tree to compile (and pass tests) in -max build
|
2005-02-17 22:52:40 +01:00 |
|
jimw@mysql.com
|
45d8283f1a
|
Merge
|
2005-02-17 13:52:39 -08:00 |
|
jimw@mysql.com
|
08624c0061
|
Merge mysql.com:/home/jimw/my/mysql-4.1-8355
into mysql.com:/home/jimw/my/mysql-4.1-clean
|
2005-02-17 13:48:34 -08:00 |
|
jimw@mysql.com
|
ca6dda8daa
|
Merge mysql.com:/home/jimw/my/mysql-4.1-5672
into mysql.com:/home/jimw/my/mysql-4.1-clean
|
2005-02-17 13:47:59 -08:00 |
|
jimw@mysql.com
|
9df11a3c5e
|
Merge mysql.com:/home/jimw/my/mysql-4.1-7989
into mysql.com:/home/jimw/my/mysql-4.1-clean
|
2005-02-17 13:47:14 -08:00 |
|
jimw@mysql.com
|
7e499384b4
|
Merge mysql.com:/home/jimw/my/mysql-4.0-clean
into mysql.com:/home/jimw/my/mysql-4.1-clean
|
2005-02-17 13:46:33 -08:00 |
|
jimw@mysql.com
|
4decbce5ea
|
Merge mysql.com:/home/jimw/my/mysql-4.0-no-merge-spam
into mysql.com:/home/jimw/my/mysql-4.0-clean
|
2005-02-17 13:45:20 -08:00 |
|
jimw@mysql.com
|
9d5b721c7e
|
Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
|
2005-02-17 13:42:18 -08:00 |
|
joerg@mysql.com
|
bbafcd4972
|
Fix a compile error (missing return value).
|
2005-02-17 22:32:21 +01:00 |
|
jimw@mysql.com
|
cc1e805c0b
|
Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
|
2005-02-17 13:22:16 -08:00 |
|
jani@ua141d10.elisa.omakaista.fi
|
6890b0aa5e
|
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
|
2005-02-17 23:04:13 +02:00 |
|
jani@ua141d10.elisa.omakaista.fi
|
a6106a0a67
|
Fixed Bug#7838, "pipe_sig_handler should be static".
|
2005-02-17 23:00:48 +02:00 |
|
jimw@mysql.com
|
1c22de9032
|
Log each slow query in a multi-statement query to the slow query log.
(Bug #8475)
|
2005-02-17 11:48:44 -08:00 |
|
marko@hundin.mysql.fi
|
15ddb5c4ca
|
Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0
|
2005-02-17 21:45:14 +02:00 |
|
jani@ua141d10.elisa.omakaista.fi
|
3bc92ed9f5
|
Fixed Bug#7783, "mysql_free_result removes all resultsets (multi statements)".
|
2005-02-17 21:45:13 +02:00 |
|
kent@mysql.com
|
87d6da972f
|
make_binary_distribution.sh, Makefile.am:
Make .disabled files part of distribution
|
2005-02-17 20:07:52 +01:00 |
|