Commit graph

10353 commits

Author SHA1 Message Date
bell@sanja.is.com.ua
c64efa6062 merge 2005-03-30 22:11:08 +03:00
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
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
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
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
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
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
serg@serg.mylan
eb5dfbe3ac Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-29 14:58:03 +02:00
bar@mysql.com
7131f313be after merge fix 2005-03-29 17:37:10 +05:00
bar@mysql.com
6d3f944d80 merge 2005-03-29 17:24:26 +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
konstantin@mysql.com
2115900460 Remove redundant my_security_attr_free() from
handle_connections_shared_memory (double free spotted by Monty).
2005-03-29 14:30:34 +04:00
monty@mysql.com
c4467b817d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-03-29 12:58:31 +03:00
monty@mysql.com
dd4b0710dd Cleanups during review 2005-03-29 12:37:36 +03:00
pekka@mysql.com
727015dbb3 Merge 2005-03-28 23:06:19 +02: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
8e028d2f88 item_func.cc:
Post merge additional fix for DECIMAL type:
  Bugs: #9425: A user variable doesn't always have implicit coercibility
2005-03-28 14:15:43 +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
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
8207241882 merged 2005-03-26 20:15:18 +01: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
serg@serg.mylan
b100adf750 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-03-26 19:49:17 +01:00
serg@serg.mylan
72c9ac844b fixes for "backport wild_compare fix from 4.1 - bug#3924" 2005-03-26 19:46:42 +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
konstantin@mysql.com
eeeedd31b9 Manual merge 2005-03-26 01:44:54 +03:00
konstantin@mysql.com
ff8017f0d3 A fix for Bug#8226 "Cannot connect via shared memory":
provide created shared memory objects with proper
access rights to make them usable when client and server
are running under different accounts. 
Post review fixes.
2005-03-26 01:21:52 +03:00
brian@zim.(none)
89838b1ebc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into zim.(none):/home/brian/mysql/mysql-5.0
2005-03-25 12:37:24 -08:00
brian@zim.(none)
0c21adf370 Fix upgrade/downgrade issue. 2005-03-25 12:36:04 -08:00
brian@zim.(none)
7b81a9fd4c Merging support for blackhole up to 5.0. 2005-03-25 10:36:58 -08:00
jimw@mysql.com
a13ef90ed1 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-25 09:42:18 -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
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