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
msvensson@shellback.(none)
8b2fd13d30
Bug#18208 SBR fails to replicate auto_increment values for Cluster
...
- Replication of tables with autoincrement not supported when maste and or slave uses storage engine "ndb"
2006-03-15 16:29:25 +01:00
mskold@mysql.com
247cedce21
Changed storage engine to be ndb
2006-03-15 16:02:11 +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
Reggie@xgeek.
fbe3db30d4
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into xgeek.:C:/work/mysql-5.1
2006-03-15 05:23:01 -06:00
Reggie@xgeek.
cb6b228bfb
README:
...
new file
2006-03-15 05:20:27 -06:00
bar@mysql.com
7be5d62f8f
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new/
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b18171
2006-03-15 15:07:13 +04: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
rburnett@production.mysql.com
c31c2eba13
Bug #17722 Test 'partition_02myisam' hangs on Windows
...
The problem where is that Visual Studio 8 includes new security features to help write more secure code. One of these features is parameter validation. Many of the CRT functions, including lseek, assert on illegal parameter values in debug builds. They also call parameter validation callback routines that can be registered. We solve this problem by defaulting the error value to -1 and then only calling lseek if the fd != -1.
my_seek.c:
Only call lseek if the fd is not -1 on Windows
2006-03-15 10:25:42 +01:00
jani@ibmlab.site
aa83fb4f25
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 10:19:24 +02:00
Reggie@xgeek.
605d6f0568
sql:
...
removed double entries for sql_yacc.* and added -p MYSQL define to call to bison
2006-03-15 02:16:16 -06:00
jani@ibmlab.site
373c17e7e2
Extended test case to check that binary column
...
actually adds zeroes, not spaces at the end.
2006-03-15 10:14:35 +02: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
jani@ibmlab.site
b3e5861a02
Added a test case for Bug#18038 MySQL server corrupts binary columns data
2006-03-15 09:40:30 +02: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
ecf41eea09
Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0-r1.2084
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.1
2006-03-14 13:28:24 -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