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
tomas@poseidon.ndb.mysql.com
8d4142ee31
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
2005-02-18 09:21:42 +01: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
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
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
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
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
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
kent@mysql.com
87d6da972f
make_binary_distribution.sh, Makefile.am:
...
Make .disabled files part of distribution
2005-02-17 20:07:52 +01:00
patg@krsna.patg.net
26d5bf9296
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-5.0
2005-02-17 10:34:39 -08: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
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
mskold@mysql.com
dc7368cf3f
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-17 16:41:38 +01:00
mskold@mysql.com
14c9ff5ce0
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-02-17 15:39:23 +01:00
mskold@mysql.com
a93816588a
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-17 15:27:16 +01: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
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
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
mskold@mysql.com
8b853bbbc7
Added tests for newdecimal in condition pushdown
2005-02-17 11:16:24 +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
igor@rurik.mysql.com
326b3ec1e7
select.test:
...
Manual post-merge
2005-02-17 00:51:27 -08: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
tomas@poseidon.ndb.mysql.com
6e51577b52
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
2005-02-17 09:37:07 +01:00
igor@rurik.mysql.com
5a3806e5df
Manual merge
2005-02-17 00:34:06 -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
patg@krsna.patg.net
986e122303
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-5.0
2005-02-16 22:36:43 -08:00
tomas@poseidon.ndb.mysql.com
7b2f7b43c5
Merge
2005-02-17 07:05:00 +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
a2c728b2ca
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-17 05:25:46 +01: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
sergefp@mysql.com
3724e8e0b4
A "fix" for problem discovered in BUG#8510: remove ONLY_FULL_GROUP_BY mode from ANSI mode, as currently
...
ONLY_FULL_GROUP_BY mode is overly restrictive.
2005-02-17 07:12:31 +03:00
kent@mysql.com
706a0dbc37
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-17 03:35:55 +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
kent@mysql.com
ba927fdb4c
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-17 03:04:28 +01: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
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