mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34141 commits 2788 branches 343 tags 1.7 GiB
Commit graph

16002 commits

Author SHA1 Message Date
gkodinov@mysql.com
9f9a76eb6e Merge mysql.com:/home/kgeorge/mysql/5.0/tmp_merge 
into  mysql.com:/home/kgeorge/mysql/5.1/merge
 2006-05-17 13:29:20 +03:00
tomas@poseidon.ndb.mysql.com
0cb31d7d5f Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail 2006-05-17 08:34:48 +02:00
tomas@poseidon.ndb.mysql.com
c5987ab67a Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail 
- adoptions to handle binlog
 2006-05-16 20:56:45 +02:00
tomas@poseidon.ndb.mysql.com
6cb699d208 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-05-16 10:37:40 +02:00
tomas@poseidon.ndb.mysql.com
08438b6054 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-05-16 10:21:37 +02:00
tnurnberg@mysql.com
d1311e1ac7 Bug#18997: DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value 
if input year for date_add() / date_sub() with INTERVAL is low enough for
calc_daynr() to possibly return incorrect results (calc_daynr() has no information
on whether the year is low because it was a two-digit year ('77) or because it
was a really low four-digit year (0077) and will indiscriminately try to turn the
value into a four-digit year by adding 1900 or 2000 respectively), the functions
will now throw NULL.
 2006-05-16 03:32:24 +02:00
cmiller@zippy.(none)
d8330e2858 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
 2006-05-15 19:26:49 -04:00
jani@a193-229-222-105.elisa-laajakaista.fi
414d5c0983 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2006-05-16 00:37:34 +03:00
tomas@poseidon.ndb.mysql.com
5971c0872b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-05-15 20:35:17 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
1b524d6b5f Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
 2006-05-15 21:33:47 +03:00
tomas@poseidon.ndb.mysql.com
ca4b18fb15 correction of merge 2006-05-15 20:29:50 +02:00
tomas@poseidon.ndb.mysql.com
747dc71f9f Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-05-15 18:44:17 +02:00
knielsen@mysql.com
5f637ef29c After-merge fixes. 2006-05-15 18:41:05 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
3846438a9c Fix, or a workaround for Bug#19386 "Multiple alter causes crashed table" 
The problem is that in a MyISAM table the following column
after a varchar field gets corrupted, if varchar field is
extended.

This should be made to work without a copy in the future, but
I'm not sure if this code is ready yet. This fix will force copy
in this case. It will not do any harm to have it here, only makes
alter table a bit slower in this case. If this should work for
MyISAM, then the bug is somewhere else in that code.

Until it works, I propose this as a temporary fix or a workaround.
Test case for the bug has been added.
 2006-05-15 19:41:04 +03:00
knielsen@mysql.com
1e8c6f16e5 Merge mysql.com:/usr/local/mysql/mysql-5.0-bug19633 
into  mysql.com:/usr/local/mysql/tmp-5.1
 2006-05-15 18:41:04 +02:00
tomas@poseidon.ndb.mysql.com
fe9934c9fe Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail 
- invalidate ndb dict cache on cluster disconnect (ClusterMgr.cpp)
- add check for correct frm on external lock when table cache is found invalid
 2006-05-15 16:23:59 +02:00
knielsen@mysql.com
6703a50f7d BUG#18037: Fix stack corruption in THD::rollback_item_tree_changes(). 
Stored procedure execution sometimes placed the address of auto variables
in the list of Item changes to undo in THD::rollback_item_tree_changes().
This could cause stack corruption.
 2006-05-15 12:01:55 +02:00
sergefp@mysql.com
a70bfd6c69 Merge mysql.com:/home/psergey/tmp_merge3 
into  mysql.com:/home/psergey/mysql-5.1-merge2
 2006-05-13 22:40:26 +04:00
acurtis@xiphis.org
4e2c63a7ba Merge bk-internal:/home/bk/mysql-5.1-new 
into  xiphis.org:/home/acurtis/mysql-5.1-merge
 2006-05-12 17:40:58 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
4bab3eed28 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
 2006-05-12 22:47:21 +03:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
640a4de065 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19140 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 15:44:15 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c85be97f50 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 12:22:31 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c558d9d00d Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19502 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 12:14:39 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
14bbe2c0ee Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19501 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 12:11:46 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
113cc95f84 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19062 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 12:09:26 -04:00
acurtis@xiphis.org
9ba0ac9579 manual merge bug#10952 2006-05-12 08:50:31 -07:00
gkodinov@mysql.com
71741526a4 Merge mysql.com:/home/kgeorge/mysql/5.0/clean 
into  mysql.com:/home/kgeorge/mysql/5.0/B7549
 2006-05-12 17:04:04 +03:00
gluh@eagle.intranet.mysql.r18.ru
a23a8780e4 Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes 
replaced get_field(MEM_ROOT *mem, Field *field) with 
get_field(MEM_ROOT *mem, Field *field, String *res).
It allows to avoid strlen().
 2006-05-12 17:34:36 +05:00
jani@a193-229-222-105.elisa-laajakaista.fi
dcd41ec846 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
 2006-05-12 13:37:56 +03:00
gluh@mysql.com
60fa42cb64 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2006-05-12 15:10:23 +05:00
gluh@eagle.intranet.mysql.r18.ru
c8944add73 Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH 2006-05-12 15:09:25 +05:00
msvensson@neptunus.(none)
9f5c15cfa8 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-12 11:51:04 +02:00
msvensson@neptunus.(none)
46f1f3ed2c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-md 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-12 11:19:37 +02:00
holyfoot@mysql.com
4d4b5c8137 Merge 2006-05-12 14:16:20 +05:00
msvensson@neptunus.(none)
40bfe246a9 Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
tnurnberg@mysql.com
ab69fac55d Merge mysql.com:/home/mysql-4.1-10418 
into  mysql.com:/home/mysql-5.0-10418
 2006-05-12 10:27:20 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
9dffc3cd01 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
 2006-05-12 11:26:42 +03:00
msvensson@neptunus.(none)
47a578f4e4 Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-12 08:45:22 +02:00
tnurnberg@mysql.com
41c276aa89 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/mysql-5.1-19509.19509
 2006-05-12 06:37:50 +02:00
reggie@linux.site
e672bdc824 removed handlerton-win.cc (again) 2006-05-11 14:46:11 -05:00
tnurnberg@mysql.com
742996dc8b Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/mysql-5.1-19509
 2006-05-11 21:46:10 +02:00
reggie@big_geek.
59b3c197a6 Merge reggie@192.168.1.107:/home/reggie/work/mysql-5.1 
into  big_geek.:C:/Work/mysql/mysql-5.1-test
 2006-05-11 14:14:10 -05:00
sergefp@mysql.com
431582afbb Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/psergey/mysql-5.1-merge6
 2006-05-11 23:14:09 +04:00
sergefp@mysql.com
e76acd803c Merge mysql.com:/home/psergey/tmp_merge2 
into  mysql.com:/home/psergey/mysql-5.1-merge6
 2006-05-11 20:44:31 +04:00
sergefp@mysql.com
acdc038a44 Bug#19136: Manual 5.0->5.1 merge 2006-05-11 20:41:11 +04:00
reggie@big_geek.
67a692f998 performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1. 
This is being pushed to a private tree and tested before being sent to the mainline.
 2006-05-11 11:29:08 -05:00
reggie@big_geek.
3def02edd1 bringing handlerton-win.cc back after incorrectly deleteing it. It is not needed for 5.1 or later but is used by 5.0 2006-05-11 11:06:35 -05:00
sergefp@mysql.com
22c71d3db8 Merge mysql.com:/home/psergey/tmp_merge 
into  mysql.com:/home/psergey/mysql-5.1-merge5
 2006-05-11 18:41:53 +04:00
gkodinov@mysql.com
0486cfbee2 BUG#7549: Missing error message for invalid view selection with subquery. 
When a view statement is compiled on CREATE VIEW time, most of the 
optimizations should not be done. Finding the right optimization 
for a subquery is one of them.
Unfortunately the optimizer is resolving the column references of 
the left expression of IN subqueries in the process of deciding 
witch optimization to use (if needed). So there should be a 
special case in Item_in_subselect::fix_fields() : check the 
validity of the left expression of IN subqueries in CREATE VIEW 
mode and then proceed as normal.
 2006-05-11 15:30:54 +03:00
tnurnberg@mysql.com
133a5d17f7 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/mysql-4.1-10418
 2006-05-11 12:48:49 +02:00