Commit graph

31999 commits

Author SHA1 Message Date
mats@mysql.com
723d5deb01 Bug#18326 (Do not lock tables for writing during prepare of statement):
Fixing tests to get the test suite passing. This does not hide the bug
since it's a matter of performance, not correctness.
2006-03-18 17:15:53 +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
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
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
andrey@lmy004.
a1d87d6a0d manual merge 2006-03-17 09:40:48 +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
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
msvensson@shellback.(none)
b640490fde Merge shellback.(none):/home/msvensson/mysql/bug17728/my51-bug17728
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-16 09:44:50 +01:00
msvensson@shellback.(none)
89c6b28147 Merge shellback.(none):/home/msvensson/mysql/bug18195/my51-bug18195
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-16 09:39:09 +01:00
msvensson@shellback.(none)
2fe3e20597 Merge shellback.(none):/home/msvensson/mysql/bug18195/my50-bug18195
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-16 09:37:47 +01:00
msvensson@shellback.(none)
f5d4028352 Merge shellback.(none):/home/msvensson/mysql/bug18195/my50-bug18195
into  shellback.(none):/home/msvensson/mysql/bug18195/my51-bug18195
2006-03-16 09:34:47 +01: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
mats@mysql.com
704c0b57e3 Bug#17400 (RBR: replication of delete and update fails for tables w/o PK):
Unable to reproduce failure: some of the 17400 tests pass, other have other failures.
The test in the bug report passes.
Enabling some tests that pass, rebranding others.
2006-03-16 09:23:37 +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.
2388e052ad Removed calls to deploy.bat from the build scripts since the cmake scripts are now
out in the target directories.
2006-03-15 10:33:16 -06: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