jimw@mysql.com
10800c1eb5
Merge mysql.com:/home/jimw/my/mysql-4.1-8475
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-18 15:40:17 -08:00
jimw@mysql.com
4823eadee7
Merge mysql.com:/home/jimw/my/mysql-4.1-8517
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-18 15:39:53 -08:00
jimw@mysql.com
29d1d9a369
Clean up merge for fix for Bug #8350 .
2005-02-18 15:23:17 -08:00
jimw@mysql.com
793a505c26
Fix merge of fix for Bug #4872 .
2005-02-18 15:02:54 -08:00
mats@mysql.com
0ad02a920c
Merge from 4.0
2005-02-18 14:19:08 +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
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)
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
bar@mysql.com
c926e43f65
A way not to compile UCA collations
2005-02-18 12:58:16 +04: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
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
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
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
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
acurtis@pcgem.rdg.cyberkinetica.com
10ab9e982f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.1
2005-02-17 17:52:49 +00:00
svoj@mysql.com
ed6c4ec925
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/svoj/devel/mysql/mysql-4.1
2005-02-17 21:40:13 +04:00
svoj@mysql.com
349112292f
bug#6958
...
Fixed that negative arguments to certain integer options wrap around.
2005-02-17 15:04:04 +04:00
lenz@mysql.com
01180054fa
- fixed a changelog entry in the RPM spec file (wrong author)
2005-02-17 11:07:33 +01:00
lenz@mysql.com
61049dcb0a
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-02-17 10:51:56 +01:00
mwagner@here.mwagner.org
e2e94c9e3f
Do-hpux-depot:
...
Perl script to create HP depot packages.
2005-02-17 02:57:40 -06:00
igor@rurik.mysql.com
b6be797f81
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2005-02-17 00:38:33 -08:00
igor@rurik.mysql.com
d2730b3342
item.h:
...
Revised the fix for bug #7098 .
Corrected the method Item_string::new_item.
sql_select.cc:
Revised the fix for bug #7098 .
Aborted the previous modifications.
2005-02-16 22:51:32 -08:00
tomas@poseidon.ndb.mysql.com
ec33ff6792
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-17 07:36:54 +01:00
igor@rurik.mysql.com
4fd1869c6b
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-16 21:20:39 -08:00
igor@rurik.mysql.com
eedde7ba3e
select.result, select.test:
...
Added a test case for bug #7098 .
sql_select.cc:
Fixed bug #7098 .
When a string field was substituted for an equal constant
the collation of the constant was changed by mistake for
the binary collation.
2005-02-16 21:17:20 -08:00
kent@mysql.com
682a27c1f0
init_db.sql:
...
Make SQL more readable, substitute hostname at runtime
mysql-test-run.pl:
Run init scripts with /bin/sh, ignore return code
2005-02-17 05:22:14 +01:00
kent@mysql.com
c9f6fbff1d
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-17 03:34:30 +01:00
jimw@mysql.com
51d6411e11
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-16 18:10:30 -08:00
kent@mysql.com
75ebab7861
Windows compatibility changes of the 'rpl_delete_all',
...
'ps_1general' and 'fulltext_cache' test cases.
2005-02-17 02:59:39 +01:00
jimw@mysql.com
64ef4ec2f3
Fix output of perror to include whether the error message
...
corresponds to an OS or MySQL error. (Bug #8517 )
2005-02-16 17:37:56 -08:00
dean@mysql.com
2baf0a158c
Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dellis/bkl/bug-4.1
2005-02-16 19:37:53 -06:00
acurtis@pcgem.rdg.cyberkinetica.com
a1bf1c926e
Bug#8147
...
Fix ambigious table error for INSERT..SELECT..UPDATE
2005-02-17 01:33:59 +00:00
dean@mysql.com
b64fdf882a
Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dellis/mysqlab/bk/mysql-4.0
2005-02-16 19:15:08 -06:00
kent@mysql.com
75b0b945ca
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-17 02:11:03 +01:00
jimw@mysql.com
af41813cff
Make post-commit trigger not send emails when the message would not contain
...
any actual changes. (Often the case in merges where the only change involves
renumbering ChangeSet entries.)
2005-02-16 14:03:16 -08:00
jimw@mysql.com
aa70a6ce06
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-16 14:01:21 -08:00
tomas@poseidon.ndb.mysql.com
33c297cfb0
bug #8556 corrupt ndb_mgm show printout for certain configurations
2005-02-16 21:54:35 +01:00
jimw@mysql.com
9df24e5ebd
When calling initgroups(), set a flag that the segfault handler checks
...
in order to output a special warning about a particular case of segfaults
due to a mix of static binaries, NSS, and LDAP. (Bug #4872 )
2005-02-16 11:58:35 -08:00
tomas@poseidon.ndb.mysql.com
788f6b5af5
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-16 20:54:47 +01:00
tomas@poseidon.ndb.mysql.com
334d92db03
reuse nodeid if ndbd is restarted
2005-02-16 20:46:34 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
3261bf189a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.1
2005-02-16 16:33:57 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
b119963f13
Merge
2005-02-16 16:29:56 +00:00