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
32981 commits 2793 branches 343 tags 1.7 GiB
Commit graph

15505 commits

Author SHA1 Message Date
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
msvensson@shellback.(none)
c8f087a105 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-17 14:40:38 +01:00
kent@mysql.com
882d9b6e1f configure.in: 
Changed release name to 5.0.19a
ha_innodb.cc:
  InnoDB used table locks (not row locks) within stored functions. (Bug #18077)
 2006-03-17 11:32:02 +01:00
elliot@mysql.com
a37fa18a69 Merge mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-4.1 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.0
 2006-03-17 10:50:01 +01:00
elliot@mysql.com
56fca811bb BUG#18283 When InnoDB returns error 'lock table full', MySQL can write 
to binlog too much.

When InnoDB has to rollback a transaction because the lock table has
filled up, it also needs to inform the upper layer that the transaction
was rolled back so that the cached transaction is not written to the
binary log.
 2006-03-17 10:25:29 +01:00
andrey@lmy004.
a1d87d6a0d manual merge 2006-03-17 09:40:48 +01:00
bell@production.mysql.com
c5337540af Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  production.mysql.com:/usersnfs/abelkin/work-qc-5.0
 2006-03-17 00:56:47 +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
msvensson@shellback.(none)
f78ed7c6be Merge shellback.(none):/home/msvensson/mysql/bug13310/my50-bug13310 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-16 12:07:24 +01:00
msvensson@shellback.(none)
2d5634b592 Add extre DBUG_PRINT in push_warning 2006-03-16 12:06:39 +01: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
bell@book.local
1626c2d9e1 We should prohobit concurent read of inserting file in SP 
because it can couse problem with Query cache (BUG#14767)
 2006-03-15 19:15:52 +02: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
mskold@mysql.com
40913583a5 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-14 16:20:56 +01:00
mskold@mysql.com
7e7a78911a Fixed typo in debug printout 2006-03-14 15:43:28 +01:00
mskold@mysql.com
a73e81898d Fix for bug#17899 Partitions: crash, NDB, Select .. ORDER BY 2006-03-14 15:27:38 +01:00
evgen@sunlight.local
5866eb948a Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into sunlight.local:/work_local/17336-bug-5.0-mysql
 2006-03-14 15:33:13 +03:00
mikael@zim.(none)
083e3da011 Manual merge 2006-03-14 03:46:12 -08:00
mikael@zim.(none)
cad342ae02 Merge zim.(none):/home/mikael/bug17127 
into  zim.(none):/home/mikael/bug16370
 2006-03-14 02:50:29 -08:00
mikael@zim.(none)
516ac72a75 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/mikael/bug16370
 2006-03-14 02:39:24 -08:00
mikael@zim.(none)
b829321dd0 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/mikael/bug17127
 2006-03-14 02:37:24 -08:00
mikael@zim.(none)
4b4b8f933e Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/mikael/bug17127
 2006-03-14 02:32:46 -08:00
mikael@zim.(none)
0ec5ee2c50 Manual merge 2006-03-14 01:39:27 -08:00
mikael@zim.(none)
ff77d7665d Merge zim.(none):/home/mikael/bug15961 
into  zim.(none):/home/mikael/bug16370
 2006-03-14 01:24:06 -08:00