mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
32033 commits 2793 branches 343 tags 1.7 GiB
Commit graph

15148 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
1d953c313e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
 2006-03-20 22:57:18 +01:00
knielsen@mysql.com
3e7d8a78db Fix compilation failure when compiling without partitioning, introduced 
by previous push.
 2006-03-20 21:57:23 +01:00
msvensson@neptunus.(none)
4064528279 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
 2006-03-20 21:41:27 +01:00
msvensson@neptunus.(none)
f12b979fb1 Merge neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835 
into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
 2006-03-20 20:16:53 +01:00
holyfoot@mysql.com
fc94004a65 merging 2006-03-20 19:22:56 +04:00
gluh@eagle.intranet.mysql.r18.ru
820731c6ed Fix for bug#15336 Partitions: crash if create table as select 
added HA_EXTRA_WRITE_CACHE case to ha_partition::extra()
 2006-03-20 18:58:21 +04:00
holyfoot@vva.(none)
936d596abc Code #ifdef-ed 2006-03-20 18:46:13 +04:00
gluh@eagle.intranet.mysql.r18.ru
c0420a5c5e Bug#14367 Partitions: crash if utf8 column 
use part_info->item_free_list instead of thd->free_list during partition function parsing
 2006-03-20 17:41:45 +04:00
holyfoot@vva.(none)
a68742f460 bug #17290 (sp with delete, create and rollback causes MySQLD core) 
additional fixes
 2006-03-20 17:30:01 +04:00
holyfoot@mysql.com
87a4e300a1 Merge bk@192.168.21.1:mysql-5.1-new 
into mysql.com:/home/hf/work/mysql-5.1.clean
 2006-03-20 15:24:14 +04:00
knielsen@mysql.com
95242e7186 Fix HPUX compilation. 2006-03-20 09:35:56 +01:00
holyfoot@mysql.com
d1909208a3 Merge bk@192.168.21.1:mysql-5.1-new 
into mysql.com:/home/hf/work/mysql-5.1.clean
 2006-03-18 18:51:17 +04:00
holyfoot@vva.(none)
8074262eda bug 17290 and bug 14350 
added THD::work_part_info member where we now store modified
partition_info structure.
It allows no solve problem when different parts of the part_info get
into different mem_roots
 2006-03-18 18:48:21 +04:00
mskold@mysql.com
8296653a91 Post-review fixes for bug#17899 Partitions: crash, NDB, Select .. ORDER BY 2006-03-18 10:04:39 +01:00
mskold@mysql.com
83d4481a5d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-03-18 08:31:28 +01:00
mats@mysql.com
a8a2d16c1d Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b17400-mysql-5.1-new
 2006-03-18 00:36:12 +01:00
mats@mysql.com
da22f2dd44 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b17400-mysql-5.1-new
 2006-03-17 18:19:10 +01:00
mats@mysql.com
4440b71dda Bug#18280 (RBR: Extreneous maps when writing to general_log and slow_log): 
Filter out replication general_log and slow_log entirely from binary
log. Caching result of table share-specific tests.
 2006-03-17 18:11:07 +01:00
mskold@mysql.com
9e9d2e0311 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-03-17 17:25:00 +01:00
jani@ibmlab.site
928591e50f Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  ibmlab.site:/home/my/bk/mysql-5.1-new
 2006-03-17 15:56:27 +02:00
andrey@lmy004.
a1d87d6a0d manual merge 2006-03-17 09:40:48 +01:00
jani@ibmlab.site
257ab4842a Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  ibmlab.site:/home/my/bk/mysql-5.1-new
 2006-03-16 19:43:45 +02:00
konstantin@mysql.com
fdd2f92116 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/opt/local/work/mysql-5.1-root
 2006-03-16 20:43:44 +03:00
jani@ibmlab.site
e94aefcd81 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  ibmlab.site:/home/my/bk/mysql-5.1-new
 2006-03-16 17:44:26 +02:00
knielsen@mysql.com
8ebf8db663 Merge bk-internal:/home/bk/mysql-5.1-new 
into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new
 2006-03-16 15:45:43 +01:00
knielsen@mysql.com
ca4ec28146 CMake Windows comp_error dependency fix after last push. 2006-03-16 15:42:48 +01:00
andrey@lmy004.
92b4381966 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug14356
 2006-03-16 14:38:20 +01:00
acurtis@xiphis.org
8276474a8c Merge acurtis@bk-internal:/home/bk/mysql-5.1-new 
into  xiphis.org:/home/antony/work2/p1-bug14575.1-mrg2
 2006-03-16 05:02:45 -08:00
knielsen@mysql.com
cdc362e174 Merge bk-internal:/home/bk/mysql-5.1-new 
into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new
 2006-03-16 13:34:33 +01:00
knielsen@mysql.com
24e29bf9d1 Fix Windows CMake dependency problem. 2006-03-16 13:30:59 +01:00
acurtis@xiphis.org
e43f49a466 Merge xiphis.org:/home/antony/work2/p1-bug14575.1 
into  xiphis.org:/home/antony/work2/p1-bug14575.1-mrg2
 2006-03-16 04:29:59 -08:00
andrey@lmy004.
05684f1fa6 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug14356
 2006-03-16 13:20:34 +01:00
andrey@lmy004.
23888ae52c fix for bug 16408 (Events: crash for an event in a procedure) 
(one patch)
 2006-03-16 13:14:40 +01:00
mikael@zim.(none)
89b10826ce BUG#17772 
A crash after ALTER TABLE t1 RENAME ...
 2006-03-16 03:21:15 -08:00
konstantin@mysql.com
2242971379 A post-review fix for Bug#17403 "Events: packets out of order 
with show create event"
 2006-03-16 13:50:00 +03:00
mats@mysql.com
6c37cfee5a Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b17400-mysql-5.1-new
 2006-03-16 09:32:33 +01:00
acurtis@xiphis.org
63fb6609da Bug#14575 
¨MySQL server crashes if you try to access to InnoDB table¨
  crash caused by schizophrenic mysqld - 2 memory locations for logically same function
  with conflicting values.
  Fixed by backporting from 5.1 changes to have_xyz_db declarations.
 2006-03-16 00:15:23 -08:00
konstantin@mysql.com
0ae0f2cd39 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/opt/local/work/mysql-5.1-root
 2006-03-15 20:40:52 +03:00
konstantin@mysql.com
386ec52a6b A fix and test case for Bug#16164 "Easter egg": 
SHOW AUTHORS caused 'Packets out of order' in stored functions:
add the corresponding SQLCOM to sp_get_flags_for_command so that
it'd return sp-related flags for it. 
Fix Bug#17403 "Events: packets out of order with show create event"
in the same chaneset.
 2006-03-15 20:21:59 +03:00
Reggie@xgeek.
11979eec94 Moved cmake scripts into the proper directories 2006-03-15 10:22:12 -06:00
mats@mysql.com
4097d049d2 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b17400-mysql-5.1-new
 2006-03-15 16:59:54 +01:00
jani@ibmlab.site
f803908e97 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  ibmlab.site:/home/my/bk/mysql-5.1-new
 2006-03-15 14:08:59 +02:00
mats@mysql.com
bea2ca46b3 Bug#18250 (Truncate table replicate both as statement and as individual 
rows for SEs using injector):
Table truncation ("DELETE FROM t1" and "TRUNCATE t1") was logged as
a statement even when the storage engine deletes the rows individually
using the injector.
 2006-03-15 11:21:36 +01:00
bar@mysql.com
e983bc7486 xml.result, xml.test: 
Adding test.
item_xmlfunc.cc:
  Bug #18171 XML: ExtractValue: the XPath position() function crashes the server!
  Disallowing use of position() and last() without context.
 2006-03-15 11:57:37 +04:00
mskold@mysql.com
ce9fdb3846 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-03-15 08:25:46 +01:00
jani@ibmlab.site
4700bb9366 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  ibmlab.site:/home/my/bk/mysql-5.1-new
 2006-03-15 09:02:21 +02:00
paul@kite-hub.kitebird.com
c52a092c62 Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0 
into  kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0-r1.2084
 2006-03-14 13:32:48 -06:00
paul@kite-hub.kitebird.com
dd0635dc38 mysqld.cc: 
Backport option description change from 5.1 to 5.0.
 2006-03-14 13:26:28 -06:00
evgen@sunlight.local
a152cac2e7 sql_select.cc: 
Afterfix for bug#17366: Unchecked Item_int results in server crash
 2006-03-14 18:49:37 +03:00
jani@ibmlab.site
18b2c36d3e Re commit of previous fix as the bk tree was broken. 2006-03-14 17:46:25 +02:00