brian@zim.(none)
8eab1ba028
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-03-23 15:04:45 -08:00
msvensson@shellback.(none)
de6b1b777c
Bug#18474 Unlistable directories yield no info from information_schema, part2
...
- Make the windows implementation of 'my_dir' behave like the default implementation
2006-03-23 23:09:34 +01:00
tomas@poseidon.ndb.mysql.com
5cc1da5424
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-23 22:50:20 +01:00
tomas@poseidon.ndb.mysql.com
57198f85d6
Bug #18472 race condition between multiple mysqld's when setting up cluster/schema
...
- check that event is the correct one, and only delete if wrong version
2006-03-23 22:49:02 +01:00
mskold@mysql.com
a945c58ffe
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-23 22:39:30 +01:00
msvensson@shellback.(none)
7162b65c24
Only run in libtool if running in valgrind.
...
Apparently libtool isn't properly setup on all our build hosts.
2006-03-23 22:29:53 +01:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
1608452dbd
Added new test cases for the bug #16806
2006-03-23 16:14:47 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
0edc061543
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
2006-03-23 16:02:20 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
2d2bd9fe7a
BUG #16806 : ALTER TABLE fails when creating new field not last in table
...
Moved some code to else path to avoid delete, create, delete, create scenarios.
Fixed up the partition info object for some cases where we move from default
partitioning in NDB to default partitioning using partitioning.
2006-03-23 16:00:58 -05:00
msvensson@shellback.(none)
9c7279e361
Merge production:mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-23 21:49:30 +01:00
msvensson@shellback.(none)
8f1ed3c463
Dump result to .log file at test failure
2006-03-23 21:48:31 +01:00
msvensson@devsrv-b.mysql.com
1b3c22b459
Remove DBUG print that looks at args[0] even if arg_count is 0
2006-03-23 21:45:00 +01:00
msvensson@shellback.(none)
3495ba51f7
Fix type "enfif" -> "endif"
2006-03-23 20:59:23 +01:00
msvensson@shellback.(none)
948cecf477
Delete gdbinit file before writing to it
...
Concat type+idx to get a unique gdbinit filename
2006-03-23 20:05:09 +01:00
brian@zim.(none)
56844bf3b5
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-03-23 10:10:24 -08:00
msvensson@shellback.(none)
4602e426dc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-23 18:58:53 +01:00
msvensson@shellback.(none)
2ef46f5ab7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-23 18:54:40 +01:00
bar@mysql.com
94814d735f
ctype-utf8.c, ctype-simple.c:
...
Forgot to include into the previous changeset.
2006-03-23 21:41:29 +04:00
msvensson@shellback.(none)
b5bea5e312
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-23 18:14:02 +01:00
brian@zim.(none)
9fc9d0f282
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-03-23 08:46:26 -08:00
kent@mysql.com
9d387d1c6e
Merge
2006-03-23 17:41:53 +01:00
kent@mysql.com
3c93e6efa5
config-win.h:
...
If CYBOZU defined, set character sets etc
2006-03-23 17:25:49 +01:00
bar@mysql.com
add4b40ebe
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-23 19:59:21 +04:00
msvensson@shellback.(none)
f4426c0d3d
Remove unused option "verbose"
2006-03-23 16:41:29 +01:00
msvensson@shellback.(none)
8091b7b5f1
Moved "tmpdir" and 2vardor" to the documented flags and add some documentation
2006-03-23 16:39:51 +01:00
knielsen@mysql.com
a3ad39cf66
Updated CMake stuff to handle the configurations needed for release
...
builds.
2006-03-23 16:34:52 +01:00
msvensson@shellback.(none)
6a65f08c26
Add support fo --manual-debug, --manual-gdb and -manual-ddd
...
Touchups
2006-03-23 16:22:56 +01:00
msvensson@shellback.(none)
5ebda1d2f6
Update after merge, function renamed
2006-03-23 16:21:20 +01:00
jonas@perch.ndb.mysql.com
ca733d4e8a
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-03-23 15:47:01 +01:00
jonas@perch.ndb.mysql.com
82925040bc
ndb -
...
remove bug#18385 from autotest as it only works on 2 node clusters
2006-03-23 15:33:40 +01:00
msvensson@shellback.(none)
e6bf664c62
Merge shellback.(none):/home/msvensson/mysql/mysqltestrun_pl/my50-mysqltestrun_pl
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-23 15:30:21 +01:00
mskold@mysql.com
a40d91284a
Post review fix of Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted', shared locking is sufficient
2006-03-23 15:20:24 +01:00
mskold@mysql.com
8dfe39291d
Post-review fix 2
2006-03-23 15:18:02 +01:00
ramil@mysql.com
d84e9df761
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2006-03-23 18:11:40 +04:00
ramil@mysql.com
2a6217a9b1
Fix for bug #18306 : MySQL crashes and restarts using subquery
2006-03-23 18:09:35 +04:00
msvensson@shellback.(none)
2b38c41bda
mysql-test-run.pl
...
Add support for debuggers and impove support for valgrind
2006-03-23 15:07:39 +01:00
msvensson@shellback.(none)
5ec7aa3aaf
Dump reject file before mysqltest in 'die'
...
Makes it easier to see what happened before the failure
2006-03-23 15:04:46 +01:00
brian@zim.(none)
aced117538
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-03-23 05:52:34 -08:00
brian@zim.(none)
bdfb7180ca
Refactored some code to remove ifdef and removed dead code related to un-useable sync code.
2006-03-23 05:51:31 -08:00
mskold@mysql.com
29e160e4a9
Post-review fix
2006-03-23 14:45:52 +01:00
bar@mysql.com
517f66b47c
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-03-23 17:30:03 +04:00
lars@mysql.com
0ba9ad02ba
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
...
into mysql.com:/users/lthalmann/bk/mysql-5.1-new
2006-03-23 11:54:17 +01:00
jonas@perch.ndb.mysql.com
705b741ab5
ndb -
...
minor fixes in test programs
2006-03-23 11:53:54 +01:00
pekka@mysql.com
c54b8647d4
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/export/space/pekka/ndb/version/my51
2006-03-23 11:35:54 +01:00
bar@mysql.com
8620ac4d64
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15376
2006-03-23 14:29:43 +04:00
lars@mysql.com
12dadb0073
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0
2006-03-23 11:23:05 +01:00
bar@mysql.com
796647f711
m_ctype.h:
...
Bug##15376
After merge fix: removing redundant macros.
2006-03-23 14:17:48 +04:00
lars@mysql.com
5c246eb985
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
...
into mysql.com:/users/lthalmann/bk/mysql-5.1-new
2006-03-23 11:17:00 +01:00
bar@mysql.com
b2b020b318
Merge mysql.com:/usr/home/bar/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-23 14:14:32 +04:00
bar@mysql.com
296d4b2f2c
Bug#15376: Unassigned multibyte codes are converted to U+0000
...
Mergeing changes into 5.0
2006-03-23 14:03:39 +04:00