Commit graph

32125 commits

Author SHA1 Message Date
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
kent@mysql.com
36da096324 Merge 2006-03-18 10:11:36 +01: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
cmiller@calliope.local
eebe4fb84d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  calliope.local:/Volumes/Source/src/mysql-5.0__bug15846
2006-03-17 18:48:27 +01:00
cmiller@calliope.local
34638c283a No longer leak file descriptors in mysql_close. Fixes Bug#15846. 2006-03-17 18:46:34 +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
rburnett@production.mysql.com
e16e4a7cc9 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  production.mysql.com:/usersnfs/rburnett/mysql-5.1
2006-03-17 14:56:25 +01:00
kent@mysql.com
7e48f7b34b configure.in:
NDB_VERSION_BUILD has to be numeric
2006-03-17 12:10:08 +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
andrey@lmy004.
50efe4ed28 fix after manual merge of fix for bug #16396: Events: Distant-future dates become past dates. 2006-03-17 11:01:45 +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
knielsen@mysql.com
2ad835a71e Merge bk-internal:/home/bk/mysql-5.1-new
into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new
2006-03-16 22:19:09 +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
knielsen@mysql.com
32e55c0071 Merge bk-internal:/home/bk/mysql-5.1-new
into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new
2006-03-16 17:00:31 +01:00
knielsen@mysql.com
8567553bcb Fix Windows CMake compilation after merge of Magnuses ssl patch. 2006-03-16 16:57:24 +01:00
jani@ibmlab.site
ba5c940377 Fixed depedency problem with the following test.
Without resetting, the next test will not pass.
2006-03-16 17:44:27 +02: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
msvensson@shellback.(none)
e4f5f138fb Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-16 16:44:25 +01:00
knielsen@mysql.com
6d7f2ff0f4 Fix example storage engine build on Windows. 2006-03-16 16:25:16 +01:00
msvensson@shellback.(none)
714689969f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-16 16:05:27 +01:00
msvensson@shellback.(none)
f8ee9e47d5 Remove disabling of rpl_ndb_multi_update2 2006-03-16 16:03:39 +01: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
msvensson@shellback.(none)
5f9138681d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-16 14:28:23 +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
msvensson@shellback.(none)
24eaa14b82 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-16 13:42:46 +01: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)
055371d890 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/mikael/bug17772
2006-03-16 03:24:39 -08:00
msvensson@shellback.(none)
59a4f5fdab Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-16 12:22:07 +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
knielsen@mysql.com
8cb582cfda Merge mysql.com:/usr/local/mysql/mysql-4.1
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-03-16 11:27:50 +01:00
knielsen@mysql.com
28592fec54 Merge mysql.com:/usr/local/mysql/mysql-4.1
into  mysql.com:/usr/local/mysql/mysql-5.0
2006-03-16 11:23:09 +01:00
knielsen@mysql.com
d75abf873e Fix bug in mysql-test-run.pl in ^C signal handler. 2006-03-16 11:21:18 +01:00
acurtis@xiphis.org
e0df8ef9a6 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into  xiphis.org:/home/antony/work2/p1-bug14575.1
2006-03-16 01:24:32 -08:00
msvensson@shellback.(none)
fc3a7388ef Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-16 09:56:49 +01:00