jimw@mysql.com
67c9b3316a
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-09 13:26:11 -08:00
lars@mysql.com
20318574d4
Merge
2005-03-09 21:41:09 +01:00
lars@mysql.com
1422a2b1b1
Fix complilation failure
2005-03-09 20:49:44 +01:00
jimw@mysql.com
71fd853121
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-09 10:40:27 -08:00
lars@mysql.com
44412afa2a
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/mysql-4.1
2005-03-09 19:32:00 +01:00
serg@serg.mylan
79573a5ee8
after merge fixes
2005-03-09 19:22:30 +01:00
lars@mysql.com
5f931f472f
Fix to make mysql-test-run.pl work with new system tables definitions
2005-03-09 19:21:57 +01:00
jimw@mysql.com
635ba88a4c
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-09 09:39:05 -08:00
serg@serg.mylan
590e6ec727
.del-ndb_multi.test~651e6ccb21dab6d9:
...
Delete: mysql-test/t/ndb_multi.test
.del-ndb_multi.result~4baa26e7403188ae:
Delete: mysql-test/r/ndb_multi.result
.del-have_multi_ndb.inc~ef8da69d972ee707:
Delete: mysql-test/include/have_multi_ndb.inc
2005-03-09 18:30:29 +01:00
jimw@mysql.com
3c7c548b9a
Fix change made to ER_READY by creating a new message, instead.
2005-03-09 08:56:50 -08:00
kent@mysql.com
3ce3295e3f
mysqldumpslow.sh:
...
bug#4914 added --help and usage information
2005-03-09 15:00:40 +01:00
serg@serg.mylan
956682de1a
merged
2005-03-09 14:09:06 +01:00
serg@serg.mylan
6121422820
sql/mysqld.cc
...
preserve backward compatibility
2005-03-09 13:41:57 +01:00
serg@serg.mylan
c49928447d
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-09 13:02:51 +01:00
serg@serg.mylan
c64b47fc0e
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-09 13:01:39 +01:00
serg@serg.mylan
0279cd50d9
myisam/myisam_ftdump.c
...
recalculate stats/gws for the last word in the index too
remove unused code
2005-03-09 12:59:20 +01:00
serg@serg.mylan
1e09c15a8b
don't close binlog in the destructor - use explictit MYSQL_LOG::cleanup for this
2005-03-09 12:29:51 +01:00
tomas@poseidon.ndb.mysql.com
ca336ad1de
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-03-09 08:25:12 +01:00
kent@mysql.com
73eea6dde9
configure.in:
...
bug#5102, bug#6862 define HAVE_VIS_H to libedit only if header and strvis() exists
2005-03-09 02:53:00 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
8d94824aa1
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4
2005-03-09 01:15:42 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
e354c75113
Fix test after merge
2005-03-09 01:13:11 +00:00
kent@mysql.com
c6002966be
mysql-test-run.pl:
...
Removed -c from /bin/sh call
make_win_src_distribution.sh:
Copy all content in mysql-test
make_win_binary_distribution.sh, make_binary_distribution.sh:
Add Perl version of mysql-test-run to package
s_win32_dsp, s_win32, s_vxworks, s_test, s_readme, s_java, s_javah:
Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
2005-03-09 01:34:22 +01:00
tomas@poseidon.ndb.mysql.com
b87f470104
added testcase for multiple tables and events
2005-03-09 01:22:12 +01:00
tomas@poseidon.ndb.mysql.com
af44acb99d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-09 01:02:13 +01:00
tomas@poseidon.ndb.mysql.com
94dc32b37a
fixed bug in event handling of several tables
...
fix crashing bug in Dict caused by Suma on CREATE_SUBID_REF
2005-03-09 01:00:08 +01:00
gbichot@quadita2.mysql.com
899e2c1f5c
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0
2005-03-09 00:37:03 +01:00
gbichot@quadita2.mysql.com
8b625529c9
This code change has 0 effects as it's about the case where innobase_very_fast_shutdown!=0,
...
which is always false. In a very fast InnoDB shutdown, we just ensure that
no more transactions are running, flush InnoDB log, signal InnoDB threads to die,
and then return from InnoDB (from innobase_end()) without waiting for those threads
to actually die. I have tested on a 4CPU machine that even with --innodb_flush_log_at_trx_commit=0,
this optimized InnoDB very fast shutdown loses no committed transactions. Patch pre-approved by Heikki.
2005-03-09 00:32:58 +01:00
acurtis@ltantony.rdg.cyberkinetica.homeunix.net
be3c863ba0
Merge in fix Bug#3788
2005-03-08 22:32:09 +00:00
Sinisa@sinisa.nasamreza.org
b8e28ff9bd
Fixing post-merge errors
2005-03-09 00:09:18 +02:00
Sinisa@sinisa.nasamreza.org
b2c77c1c9c
post merge fixes
2005-03-08 22:59:21 +02:00
Sinisa@sinisa.nasamreza.org
f066f4db83
making a better test case for bug #8850
2005-03-08 22:44:35 +02:00
marko@hundin.mysql.fi
fa001505e3
mysqld.cc:
...
main(): add missing parameter to printf(ER(ER_READY),...) call
2005-03-08 22:33:11 +02:00
serg@serg.mylan
eb0fc8ff28
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-08 21:33:10 +01:00
tomas@poseidon.ndb.mysql.com
e967891e39
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-08 20:38:06 +01:00
paul@kite-hub.kitebird.com
d6b9e709bf
changelog-5.0.xml:
...
Add dummy changelog file. It should merge upward without conflict.
2005-03-08 13:15:36 -06:00
paul@kite-hub.kitebird.com
3a81683c05
changelog-4.1.xml:
...
Add dummy changelog file. It should merge upward without conflict.
2005-03-08 13:13:15 -06:00
serg@serg.mylan
5a2c426eb8
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-08 19:47:49 +01:00
serg@serg.mylan
9272081ebb
BUG#6635 - test_if_skip_sort_order() thought it can skip filesort
...
for fulltext searches too
2005-03-08 19:45:55 +01:00
marko@hundin.mysql.fi
2bfe884320
dict0load.c:
...
dict_load_table(): Do not complain about mix_len != 0,
because MySQL 3.23.4x left garbage in that column.
2005-03-08 20:06:09 +02:00
Sinisa@sinisa.nasamreza.org
172294e92e
Fix to make builds possible
2005-03-08 20:06:08 +02:00
pem@mysql.com
699c8f38d8
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-03-08 18:19:21 +01:00
joerg@mysql.com
b2c4d73997
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-03-08 17:35:53 +01:00
jani@ua141d10.elisa.omakaista.fi
633f50cbef
Added possibility to add disabled tests to mysql-test-run.
2005-03-08 18:32:31 +02:00
joerg@mysql.com
3bbc35ac01
Merge changes.
2005-03-08 17:24:07 +01:00
pem@mysql.com
d8592e88ae
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-03-08 17:12:51 +01:00
jani@ua141d10.elisa.omakaista.fi
54f2f46ff1
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-03-08 18:12:50 +02:00
jani@ua141d10.elisa.omakaista.fi
8db4423b8c
Fixed Bug#8922.
...
Reverted Jim's patch.
2005-03-08 18:12:12 +02:00
marko@hundin.mysql.fi
48cd94d9ae
After merge fixes
2005-03-08 17:18:27 +02:00
marko@hundin.mysql.fi
63d01ae103
dict0load.c:
...
dict_load_table(): Remove the check for row_format=compact for now,
because the flag bit we used (high-order bit of mix_len)
has not been zero for at least two customers.
2005-03-08 17:08:17 +02:00
marko@hundin.mysql.fi
c098c27af5
InnoDB: Win64 portability fixes
2005-03-08 16:25:31 +02:00