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
marko@hundin.mysql.fi
e1d4e17b4c
Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/marko/mysql-5.0
2005-02-17 20:58:49 +02:00
jani@ua141d10.elisa.omakaista.fi
de40cf0178
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 20:21:29 +02:00
jani@ua141d10.elisa.omakaista.fi
d378dbe83d
Fixed Bug#7873.
2005-02-17 20:20:48 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
35f772c2bd
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 17:53:05 +00: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
acurtis@pcgem.rdg.cyberkinetica.com
647eaaea1d
Bug#8147
...
Merge from 4.1
2005-02-17 17:38:13 +00:00
heikki@hundin.mysql.fi
173e200c65
innodb.test, innodb.result:
...
Remove the test show status like InnoDB_rows_read; the value on IA64 was 0.01 percent bigger than on x86; maybe some different optimization
2005-02-17 19:20:13 +02:00
tomas@poseidon.ndb.mysql.com
e16c36d179
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-17 18:07:02 +01:00
marko@hundin.mysql.fi
baffd9ad2d
After review fixes (Bug #5682 )
2005-02-17 18:40:45 +02:00
marko@hundin.mysql.fi
612e06617c
InnoDB: Make CREATE TABLE return error when the minimum row length
...
exceeds the maximum record size. (Bug #5682 )
2005-02-17 17:15:29 +02:00
msvensson@neptunus.(none)
55824f59b7
Merged test case
2005-02-17 14:45:52 +01:00
msvensson@neptunus.homeip.net
a004533a76
BUG#8547: Wrong errormessage when dropping table that does not exist in NDB
...
- Added tescases
- Added handling of HA_ERR_NO_SUCH_TABLE in mysql_rm_table_part2 so that
error messages now are consistent
2005-02-17 14:22:44 +01:00
jani@ua141d10.elisa.omakaista.fi
10ab1c5582
Fixed a result file. Some redundant notes printing had been removed from source
...
code, because a warning was given also.
2005-02-17 15:12:49 +02:00
tomas@poseidon.ndb.mysql.com
7d85158a8d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-17 14:03:45 +01:00
serg@serg.mylan
530eecbd99
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-17 14:00:44 +01:00
serg@serg.mylan
2b41b8fa01
post-review fixes. Now ROLLBACK is done in Format_description_log_event
2005-02-17 13:52:16 +01:00
jani@ua141d10.elisa.omakaista.fi
36998b7cb7
Fixed Bug#8042, "mysqld crashes on sighup".
2005-02-17 14:07:28 +02:00
pekka@mysql.com
e2268e55c3
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/pekka/ndb/version/my50
2005-02-17 12:13:17 +01:00
pekka@mysql.com
f789749757
ndb - accept ps_7ndb.result
2005-02-17 12:13:16 +01: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
ab2a4c4d54
Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0
2005-02-17 11:09:35 +01: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
65e804612f
Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0
2005-02-17 10:56:20 +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
igor@rurik.mysql.com
817bf33d48
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-02-17 01:51:56 -08:00
tomas@poseidon.ndb.mysql.com
9e4ed03cc9
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-17 10:45:40 +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
326b3ec1e7
select.test:
...
Manual post-merge
2005-02-17 00:51:27 -08:00
bar@mysql.com
3ee09679d0
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0.fresh
2005-02-17 12:38:33 +04: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
5a3806e5df
Manual merge
2005-02-17 00:34:06 -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