gbichot@quadita2.mysql.com
|
d6e1e5b417
|
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
|
2005-05-10 11:31:46 +02:00 |
|
msvensson@neptunus.(none)
|
f3890e9440
|
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
|
2005-05-10 10:49:50 +02:00 |
|
sergefp@mysql.com
|
b580a12d47
|
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug10095
|
2005-05-10 00:43:18 +02:00 |
|
sergefp@mysql.com
|
d1e9d9b981
|
Fix for BUG#10070: Make the test not to produce warnings if InnoDB is not available
|
2005-05-10 00:40:41 +02:00 |
|
jimw@mysql.com
|
cde9f56b45
|
Merge
|
2005-05-09 11:28:57 -07:00 |
|
gluh@mysql.com
|
2ae1faaf4b
|
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9404
|
2005-05-09 18:28:53 +00:00 |
|
gluh@mysql.com
|
828237909f
|
after merge fix
|
2005-05-09 18:18:59 +00:00 |
|
gluh@mysql.com
|
03234c48cf
|
manual merge
|
2005-05-09 17:21:44 +00:00 |
|
gluh@mysql.com
|
12085567de
|
Fix for bug #9404: information_schema: Weird error messages with SELECT SUM() ... GROUP BY queries
|
2005-05-09 16:22:49 +00:00 |
|
bar@noter.(none)
|
c783cb3d7e
|
SUBSTR with negative argument didn't work
with multi-byte strings, length() instead
of numchars() where used in a mistake.
|
2005-05-09 20:55:06 +05:00 |
|
antony@ltantony.mysql.com
|
ddf6225def
|
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
into ltantony.mysql.com:/usr/home/antony/work2/p3-bug8733
|
2005-05-09 14:50:56 +01:00 |
|
antony@ltantony.mysql.com
|
cc3bfc6ff1
|
Bug#8733 - server accepts malformed query (multiply mentioned distinct)
Detect conflicting options in SELECT
|
2005-05-09 14:31:46 +01:00 |
|
dlenev@mysql.com
|
e7f29e1904
|
Manual merge of fix for bug #9913 into 5.0 tree.
|
2005-05-09 16:21:57 +04:00 |
|
lenz@mysql.com
|
5cdf15a919
|
- added "--skip-comments" to the "mysqldump" test to avoid printing comments that include
version-dependent information (which causes test failures when running the test with a
different version string)
|
2005-05-09 09:25:47 +02:00 |
|
ramil@ram-book.(none)
|
2d21a31b60
|
Brian's mysqldump test modifications made on Ramil's laptop.
|
2005-05-09 12:21:19 +05:00 |
|
ramil@mysql.com
|
948ae47bc2
|
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/5.0
|
2005-05-09 12:06:42 +05:00 |
|
ramil@ram-book.(none)
|
1092c4d8b4
|
Fix for bug #9798: Rollup crash with InnoDB in setup_sum_funcs().
|
2005-05-09 11:43:52 +05:00 |
|
brian@zim.(none)
|
8636468466
|
Merge
|
2005-05-08 16:19:06 -07:00 |
|
lenz@mysql.com
|
44c857ad4d
|
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
|
2005-05-09 00:51:05 +02:00 |
|
lenz@mysql.com
|
1b198a78b2
|
- fix the range test to pass when InnoDB is note enabled (e.g. in the "-classic" build)
|
2005-05-09 00:47:47 +02:00 |
|
brian@brian-akers-computer.local
|
a8968e337d
|
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
|
2005-05-08 14:24:43 -07:00 |
|
antony@ltantony.mysql.com
|
3dce5fa432
|
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-5.0
|
2005-05-07 22:58:09 +01:00 |
|
brian@brian-akers-computer.local
|
39f4e5755d
|
Patch for --insert-ignore
|
2005-05-07 09:49:39 -07:00 |
|
joerg@trift-lap.fambruehe
|
25cf90edbd
|
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into trift-lap.fambruehe:/MySQL/M50/mysql-5.0
|
2005-05-07 18:23:36 +02:00 |
|
joerg@trift-lap.fambruehe
|
84af50133b
|
Corrections to test "sp", stored procedure "fib" (see entry 9937 in the bug DB).
|
2005-05-07 18:06:02 +02:00 |
|
antony@ltantony.mysql.com
|
4fe845e8d0
|
Merge
|
2005-05-07 16:50:22 +01:00 |
|
gbichot@quadita2.mysql.com
|
a85ecdb670
|
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
|
2005-05-07 17:26:01 +02:00 |
|
jimw@mysql.com
|
8c7d487ae7
|
Fix tests after merge
|
2005-05-07 08:25:59 -07:00 |
|
jimw@mysql.com
|
80933d9f95
|
Merge
|
2005-05-07 08:25:58 -07:00 |
|
gluh@mysql.com
|
3ce315ce33
|
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.10261
|
2005-05-07 15:25:57 +00:00 |
|
gluh@mysql.com
|
f6bf2680b2
|
Fix for bug#10261: INFORMATION_SCHEMA.COLUMNS, incomplete result for non root user
I_S table columns information is available for any user
|
2005-05-07 15:14:34 +00:00 |
|
holyfoot@mysql.com
|
1d71dece3e
|
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9527
|
2005-05-07 18:55:47 +05:00 |
|
gluh@mysql.com
|
64cbbf1463
|
Fix for bug #9838: INFORMATION_SCHEMA.COLUMNS columns of granted views missing
|
2005-05-07 13:55:46 +00:00 |
|
antony@ltantony.mysql.com
|
a5e9523364
|
Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug9666
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1
|
2005-05-07 14:46:54 +01:00 |
|
antony@ltantony.mysql.com
|
687417be74
|
Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug9725
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1
|
2005-05-07 14:43:03 +01:00 |
|
antony@ltantony.mysql.com
|
1af671bf36
|
Bug#9666 - Can't use 'DEFAULT FALSE' for column of type bool
Fix bug by moving TRUE/FALSE in with other literals.
|
2005-05-07 13:51:29 +01:00 |
|
antony@ltantony.mysql.com
|
1ebc9e37ea
|
Bug#9725 - "disapearing query/hang" and "unknown error" with "on duplicate key update"
INSERT IGNORE...UPDATE causes break in protocol or unknown error message.
Fix so that protocol doesn't break by properly ignoring dups.
|
2005-05-07 13:31:37 +01:00 |
|
gluh@mysql.com
|
a8febcd7d2
|
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9897
|
2005-05-07 12:21:48 +00:00 |
|
gluh@mysql.com
|
d76be7ab3f
|
Fix for bug#9897: Views: 'Check Table' crashes MySQL, with a view and a table in the statement
thd->lex->derived_tables should be zero(it may be changed if we open a view)
|
2005-05-07 12:17:54 +00:00 |
|
holyfoot@hf-ibm.(none)
|
0dcb4707a0
|
Test case added for bug #9527 (negative zero is a nonsence)
|
2005-05-07 14:52:03 +05:00 |
|
jimw@mysql.com
|
ef183de687
|
Merge mysql.com:/home/jimw/my/mysql-4.1-8497
into mysql.com:/home/jimw/my/mysql-4.1-clean
|
2005-05-07 01:00:24 -07:00 |
|
holyfoot@hf-ibm.(none)
|
7ca35c2f66
|
Small fix for the test
|
2005-05-07 12:11:05 +05:00 |
|
holyfoot@mysql.com
|
fb37258872
|
Merge mysql.com:/home/hf/work/mysql-5.0.clean
into mysql.com:/home/hf/work/mysql-5.0.10004
|
2005-05-07 02:26:45 +05:00 |
|
ramil@mysql.com
|
e95d77c61d
|
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/mysql-5.0
|
2005-05-07 02:26:44 +05:00 |
|
gluh@mysql.com
|
a36ac81bd4
|
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.8998
|
2005-05-06 21:26:43 +00:00 |
|
gluh@mysql.com
|
f285b4fcee
|
Fix for bug#8998: information_schema: Table SCHEMATA should report default collations
DEFAULT_COLLTION_NAME field is added to SCHEMATA table
|
2005-05-06 20:14:22 +00:00 |
|
gbichot@quadita2.mysql.com
|
ea1bc59ed9
|
Dmitri please review. Fix for BUG#10417 "CREATE TRIGGER not written to binlog":
writing DROP and CREATE TRIGGER to binlog, disabling binlogging
of substatements, testing.
|
2005-05-06 18:52:19 +02:00 |
|
holyfoot@mysql.com
|
3474ae5aac
|
merging
|
2005-05-06 20:31:50 +05:00 |
|
ramil@mysql.com
|
0316492d77
|
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/mysql-5.0
|
2005-05-06 20:11:02 +05:00 |
|
ramil@ram-book.(none)
|
bec93d485b
|
fix for bug #4082: Integer lengths cause truncation with DISTINCT CONCAT and InnoDB
|
2005-05-06 20:11:01 +05:00 |
|