msvensson@neptunus.(none)
c93ae4f8a1
Merge
2005-03-30 14:32:53 +02:00
msvensson@neptunus.(none)
9471e922f1
Merge neptunus.(none):/home/msvensson/mysql/bug8807
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-synced
2005-03-30 14:30:32 +02:00
ramil@mysql.com
e9dbf09dfc
Merge
2005-03-30 17:07:40 +05:00
sergefp@mysql.com
86e3a378ea
Fix for BUG#9213: GROUP BY returns wrong query results:
...
Make test_if_skip_sort_order() rebuild tab->ref if it decides to use an index
different from the index join optimizer has choosen.
2005-03-30 15:57:42 +04:00
msvensson@neptunus.(none)
382a8c0048
BUG#8807 Select crash server
...
- Add function Item_param::fix_fields which will update any subselect they are part of and indicate that the subsleect is not const during prepare phase, and thus should not be executed during prepare.
2005-03-30 12:14:37 +02:00
bar@mysql.com
63d2f81a07
Remove .opt file for faster test running.
2005-03-30 14:10:27 +05:00
bell@sanja.is.com.ua
dcdda90a11
Merge
2005-03-30 10:27:36 +03:00
bell@sanja.is.com.ua
4fdb0f48e7
postreview changes
...
fixed bug in IN/ALL/ANY subqeries with HAVING clause (BUG#9350)
2005-03-30 10:07:08 +03:00
jimw@mysql.com
690183d1a0
Eliminate most of the remaining hardcoded list of tests to skip
...
by adding check for embedded server within tests and splitting some
tests into multiple test files.
2005-03-29 17:17:46 -08:00
jimw@mysql.com
bfa7520356
Clean up InnoDB testing with embedded server.
2005-03-29 16:10:43 -08:00
jimw@mysql.com
46eda5b998
Shift skipping of some tests with embedded server from within
...
mysql-test-run to the tests themselves.
2005-03-29 15:50:16 -08:00
serg@serg.mylan
884abd39fc
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-30 00:27:35 +02:00
serg@serg.mylan
ab5c10c100
after merge fix
2005-03-30 00:24:58 +02:00
joerg@mysql.com
27a0de2443
Propagate the new '--with-big-tables' flag from 4.1 to 5.0.
...
Incomplete, as the macro body must ne in the new file 'config/ac-macros/misc.m4'
which will follow in a separate changeset.
2005-03-29 21:06:22 +02:00
kent@mysql.com
4bd90706e4
init_db.sql:
...
Updates to be in sync with 'mysql_create_system_tables'
2005-03-29 19:04:19 +02:00
kent@mysql.com
e2d973bda0
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-03-29 18:53:44 +02:00
kent@mysql.com
b88ed6c723
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-03-29 18:48:31 +02:00
mskold@mysql.com
fb65ac1551
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-03-29 17:56:34 +02:00
mskold@mysql.com
f8101348f5
New test result
2005-03-29 15:36:02 +02:00
mskold@mysql.com
c91034fea8
Backport of ChangeSet 1.1700.256.8: Export the variable MASTER_MY_PORT1 from the place where the second master is started
2005-03-29 15:15:28 +02:00
bar@mysql.com
e8b86b0410
type_bit.result:
...
after merge fix
,
2005-03-29 17:41:17 +05:00
bar@mysql.com
7131f313be
after merge fix
2005-03-29 17:37:10 +05:00
bar@mysql.com
ba115894c5
Better error message.
...
Bugs#9057: Incorrect errormsg for too-large char field in table definition
2005-03-29 15:43:00 +05:00
kent@mysql.com
d917683515
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-03-29 08:06:43 +02:00
kent@mysql.com
0544c68e1c
mysql-test-run.pl:
...
Corrected typo
mtr_diff.pl:
A simplified unified diff in Perl
new file
2005-03-29 07:29:38 +02:00
pekka@mysql.com
727015dbb3
Merge
2005-03-28 23:06:19 +02:00
jimw@mysql.com
9c86b35194
Fix reconnect when using prepared statements, and add
...
--disable_reconnect and --enable_reconnect to mysqltest
so that it can be tested properly. (Bug #8866 )
2005-03-28 09:59:41 -08:00
bell@sanja.is.com.ua
1659dacab1
fixed mechanism of detection selection from table wich we update
...
(BUG##9398, BUG#8703)
fixed wrong join view detection in multi-delete which lead to server crash
2005-03-28 15:13:31 +03:00
serg@serg.mylan
55d3d94c3b
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-28 13:56:27 +02:00
bar@eagle.intranet.mysql.r18.ru
f0d41136df
Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1
...
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
2005-03-28 14:23:03 +05:00
bar@mysql.com
9852c6a082
union.test:
...
Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
Prove that this problem was fixed with bug9425 fix too.
2005-03-28 14:17:47 +05:00
bar@eagle.intranet.mysql.r18.ru
ef81035ff4
Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1
...
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
2005-03-28 14:08:25 +05:00
bar@mysql.com
e60daecc87
Bug#9425 A user variable doesn't always have implicit coercibility
...
Coercibility fixes for numeric types and not defined values were done.
2005-03-28 14:01:57 +05:00
serg@serg.mylan
a2f7cceb82
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-28 10:20:41 +02:00
bar@eagle.intranet.mysql.r18.ru
d19fff495b
Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1
...
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
2005-03-28 12:34:00 +05:00
bar@mysql.com
06bcfe8886
func_system.test, ctype_utf8.test, func_system.result, ctype_utf8.result:
...
Prove that the queries mentioned in
Bugs#5980: NULL requires a characterset in a union
works fine after recent changes related to itroducing
more coercibility level: IRNORABLE and SYSCONST.
2005-03-28 12:24:12 +05:00
serg@serg.mylan
a2ad96cf9e
more wild_compare tests
2005-03-27 15:46:06 +02:00
dlenev@brandersnatch.localdomain
d4b20f4a86
Fix for bugs #5859 "DROP TABLE does not drop triggers" and
...
#6559 "DROP DATABASE forgets to drop triggers".
If we drop table we should also drop all triggers associated with it.
To do this we have to check for existence of .TRG file when we are
dropping table and delete it too.
2005-03-27 16:15:21 +04:00
serg@serg.mylan
2dd1847bc2
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-26 19:49:24 +01:00
gbichot@quadita2.mysql.com
e207736b84
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-03-26 19:20:13 +01:00
brian@zim.(none)
8e50a98e71
Adding rules for building blackhole, also updating test case.
2005-03-25 13:43:42 -08:00
brian@zim.(none)
3d2554bcef
Resolving merge.
2005-03-25 12:39:16 -08:00
brian@zim.(none)
0c21adf370
Fix upgrade/downgrade issue.
2005-03-25 12:36:04 -08:00
brian@zim.(none)
274c3826a8
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-03-25 12:34:07 -08:00
brian@zim.(none)
7b81a9fd4c
Merging support for blackhole up to 5.0.
2005-03-25 10:36:58 -08:00
gbichot@quadita2.mysql.com
9a139ddcd3
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-03-25 14:55:41 +01:00
gbichot@quadita2.mysql.com
ead47f4701
WWe now store the catalog in Query_log_event in binlog WITHOUT its end zero.
...
This saves one byte per Query_log_event on disk compared to 5.0.[0..3]. Compatibility problems with 5.0.x where x<4
are explained in the comments in log_event.cc. Putting back s/my_open(O_TRUNC)/(my_delete+my_create) change which had
been wiped away by somebody doing a wrong 4.1->5.0 merge (which happened just
before 5.0.3 :( ). Applying it to new events for LOAD DATA INFILE.
If slave fails in Execute_load_query_log_event::exec_event(),
don't delete the file (so that it's re-usable at next START SLAVE).
And (youpi!) fix for BUG#3247 "a partially completed LOAD DATA INFILE is not
executed at all on the slave" (storing an Execute_load_query_log_event
to binlog, with its error code, instead of Delete_file_log_event).
2005-03-25 14:51:17 +01:00
bar@eagle.intranet.mysql.r18.ru
5493b4a03b
Many files:
...
Moving UCS2 test into ctype_ucs
Bug#9232 Test failure: mysql_client_test and type_newdecimal
2005-03-25 17:17:17 +04:00
bar@eagle.intranet.mysql.r18.ru
e76019bc42
Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1
...
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
2005-03-25 16:23:16 +04:00
gluh@gluh.mysql.r18.ru
fe0b425e0a
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-5.0.8941
2005-03-25 15:09:22 +03:00