Commit graph

21676 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
2e2ff0459f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-03-30 17:54:10 +02:00
pem@mysql.comhem.se
8df8afc270 Fixed BUG#6600: Stored procedure crash after repeated calls with check table.
Sedond attempt: Simply disallow CHECK in SPs, since it can't work.
2005-03-30 17:43:52 +02:00
ramil@mysql.com
8098ef79f0 after merge fix/ 2005-03-30 18:57:56 +05:00
monty@mysql.com
fac67f091c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-03-30 16:01:30 +03:00
monty@mysql.com
332b7ed4a1 Give warnings if wrong date/time/datetime argument for STR_TO_DATE
Small fixes while doing review of new pushed code
More test cases for decimal
2005-03-30 16:00:31 +03:00
ramil@mysql.com
36bb01016c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-03-30 17:51:40 +05:00
msvensson@neptunus.(none)
b7ab584096 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-synced
2005-03-30 14:33:55 +02:00
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
serg@serg.mylan
fdf32bd406 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-30 14:14:52 +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
serg@serg.mylan
de8015f040 merged 2005-03-30 12:03:02 +02:00
ramil@mysql.com
fb87f5b5c4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/mysql-4.1
2005-03-30 14:51:23 +05:00
ramil@mysql.com
1a25c55e49 A fix (bug #9401: type_timestamp segfaults mysqld) 2005-03-30 14:43:56 +05:00
bar@mysql.com
0f66f9e848 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2005-03-30 14:11:17 +05:00
bar@mysql.com
63d2f81a07 Remove .opt file for faster test running. 2005-03-30 14:10:27 +05:00
serg@serg.mylan
a4ecd183fe Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-30 10:59:27 +02:00
serg@serg.mylan
64af284975 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-03-30 10:53:53 +02:00
serg@serg.mylan
9db4daf111 merged 2005-03-30 10:52:28 +02:00
serg@serg.mylan
2a297353c6 don't strcmp db if it's a pattern 2005-03-30 10:43:24 +02: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
kent@mysql.com
37e5d20d3e Merge 2005-03-30 02:59:17 +02:00
kent@mysql.com
456aba6e65 Merge 2005-03-30 02:49:21 +02:00
kent@mysql.com
bb713b13df Do-compile:
Added option --with-big-tables
2005-03-30 02:41:08 +02:00
kent@mysql.com
30ae22847f Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-03-30 02:34:21 +02:00
kent@mysql.com
34f212ea0e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-03-30 02:31:23 +02:00
kent@mysql.com
f5a24d42f0 Do-compile:
Added option --with-blackhole
2005-03-30 02:28:41 +02: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
serg@serg.mylan
1b4a815637 Fedora now defines read(2)/write(2) as macros.
Argh!
2005-03-29 23:31:56 +02:00
serg@serg.mylan
2d666071bc typo fixed 2005-03-29 23:03:36 +02:00
joerg@mysql.com
1b2b0e66d8 Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/merge-5.0 2005-03-29 21:17:51 +02:00
joerg@mysql.com
37fd05fe49 Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/push-5.0 2005-03-29 21:13:56 +02:00
joerg@mysql.com
c4726b9e20 Implement the new '--with-big-tables' flag to "configure".
Using it comes merged from 4.1.
2005-03-29 21:11:52 +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
serg@serg.mylan
74360bcd5c Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-29 20:16:35 +02:00
joerg@mysql.com
1ad3d339f5 Merge 2005-03-29 19:25:55 +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
joerg@mysql.com
4951842842 Post-review fix: Drop the duplicate assignment. 2005-03-29 18:55:47 +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
gbichot@production.mysql.com
3cd2a3b21b Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod
2005-03-29 17:47:48 +02:00
gbichot@production.mysql.com
260d4dd493 making Q_CATALOG_CODE be understood by 5.0.4 slave, so that 5.0.3->5.0.4 repl can work (but 5.0.4->5.0.3 won't). 2005-03-29 17:26:38 +02:00
joerg@mysql.com
c90a6c7067 Introduce "configure" support for a new '-with-big-tables' option that can replace
the current way of passing '-DBIG_TABLES' to the compilers.

This is needed even in 4.0, as 'Do-compile-all' must use this new approach for
all "max" builds in 4.0, 4.1, and up.
2005-03-29 16:34:33 +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