msvensson@neptunus.(none)
f454fc8a6c
BUG#8585 ndb_cache fails on aix52
2005-02-18 13:29:27 +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
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
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
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
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
svoj@mysql.com
349112292f
bug#6958
...
Fixed that negative arguments to certain integer options wrap around.
2005-02-17 15:04:04 +04:00
igor@rurik.mysql.com
326b3ec1e7
select.test:
...
Manual post-merge
2005-02-17 00:51:27 -08: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
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
dean@mysql.com
2f7595ea84
Merge mysql.com:/home/dellis/bkl/bug-4.1
...
into mysql.com:/home/dellis/bkl/bug-5.0
2005-02-16 17:35:00 -06:00
guilhem@mysql.com
18ecaae189
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0-xa
2005-02-16 23:27:20 +01:00
guilhem@mysql.com
f314564451
Fixes after 4.1->5.0 merge.
2005-02-16 23:23:20 +01:00
pekka@mysql.com
338f75a49d
ndb - fix new decimal type mysql vs. ndb
2005-02-16 21:19:42 +01:00
guilhem@mysql.com
0987d81ae6
Merge
2005-02-16 21:03:58 +01:00
pekka@mysql.com
c32fc95769
ndb - temp: comment out decimal tests t/ndb*
2005-02-16 17:10:17 +01:00
pem@mysql.com
25a9717a03
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-02-16 16:12:52 +01:00
pem@mysql.comhem.se
de2b28c1ad
Fixed BUG#8540: Local variable overrides an alias.
2005-02-16 16:06:41 +01:00
pekka@mysql.com
c177f9fc4a
Merge
2005-02-16 13:14:21 +01:00
pekka@mysql.com
0d03304294
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my41-1.2154.30.2
2005-02-16 12:48:38 +01:00
pekka@mysql.com
7c9a155c4a
ndb - fix old decimal type mysql vs ndb
2005-02-16 12:45:59 +01:00
dean@mysql.com
e7f410a14a
Merge
2005-02-16 04:04:34 -06:00
gluh@gluh.mysql.r18.ru
638dc7d9e9
Fix for bug#7915: crash,JOIN VIEW, subquery, SELECT .. FROM INFORMATION_SCHEMA.COLUMNS
2005-02-16 13:00:03 +03:00
dean@mysql.com
87718094aa
fulltext.test, fulltext.result:
...
Test case for bug#8522, to test for out of bounds memory access in ft_nlq_find_relevance().
2005-02-16 03:13:29 -06:00
guilhem@mysql.com
8e93873d5b
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-16 10:02:54 +01:00
guilhem@mysql.com
bbcc1464d5
rpl_multi_query.test: disable ps-protocol as PS don't support multi-queries
2005-02-16 10:01:05 +01:00
igor@rurik.mysql.com
3100f891d2
Manual merge
2005-02-15 21:03:17 -08:00
igor@rurik.mysql.com
d9f66a261b
Merge rurik.mysql.com:/home/igor/mysql-4.0
...
into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
2005-02-15 18:48:04 -08:00
igor@rurik.mysql.com
d4779d3534
delete.result, delete.test:
...
Added a test case for bug #8392 .
sql_delete.cc:
Fixed bug #8392 .
The bug caused a crash for a delete statement with ORDER BY
that explicitly referred to the modified table.
2005-02-15 18:45:42 -08:00
jimw@mysql.com
a6afab6a55
Always lowercase database names from 'host' and 'db' grant tables when they
...
are loaded and lower_case_table_names is set, but issue a warning when it is
done. (Bug #7989 )
2005-02-15 13:36:46 -08:00
jimw@mysql.com
dee9795b5b
Merge
2005-02-15 12:19:01 -08:00
dlenev@brandersnatch.localdomain
0a96ef4c90
Temporary disabling part of test which fails in --ps-protocol mode.
2005-02-15 22:17:44 +03:00
monty@mysql.com
38d1a42481
Merge with 4.1
2005-02-15 17:12:13 +02:00
monty@mysql.com
410e51c854
Fixed failing test cases 'row.test' when running with --ps-protocol
...
Simple optimzations done while reviewing code
2005-02-15 16:45:00 +02:00
guilhem@mysql.com
a8380942bf
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-15 14:12:26 +01:00