knielsen@mysql.com
bc6628d27f
Some changes to make it possible to build for Windows with CMake from
...
a normal 'make dist' source .tar.gz.
2006-03-24 22:50:56 +01:00
knielsen@mysql.com
443ac64226
Improved fix for HPUX compile failure.
2006-03-24 12:24:31 +01:00
knielsen@mysql.com
87a9d85ea1
Fix mysql-test-run.pl so that mysql_client_test works in a CMake build tree.
2006-03-24 11:49:11 +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
knielsen@mysql.com
9c84881310
Define USE_TLS when compiling libmysql.dll, to avoid crashing when
...
loaded at runtime.
2006-03-22 09:55:26 +01:00
tomas@poseidon.ndb.mysql.com
bdc3f48545
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-21 12:34:45 +01:00
tomas@poseidon.ndb.mysql.com
c9c0a6d690
disabled undeterministic test
2006-03-21 12:33:13 +01:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
7432108f46
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754
2006-03-21 00:00:19 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
86086e7193
Manual merge
2006-03-20 23:55:10 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
4d2b8f8ef6
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754
2006-03-20 22:47:48 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
f9075c0732
BUG#17754
...
Fixed result files
2006-03-20 21:46:16 -05:00
knielsen@mysql.com
3e7d8a78db
Fix compilation failure when compiling without partitioning, introduced
...
by previous push.
2006-03-20 21:57:23 +01:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
738176c15f
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754
2006-03-20 14:41:50 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
bd77396a94
BUG#17754
...
Added new syntax ALTER TABLE t1 REMOVE PARTITIONING,
changed semantics of ALTER TABLE t1 ENGINE=X; to not remove partitioning
Fix a number of mix engine bugs in partitioning
2006-03-20 14:36:21 -05:00
holyfoot@vva.(none)
28834f4466
merging
2006-03-20 19:37:44 +04:00
holyfoot@mysql.com
fc94004a65
merging
2006-03-20 19:22:56 +04:00
tomas@poseidon.ndb.mysql.com
2c991eec59
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-20 16:05:09 +01:00
tomas@poseidon.ndb.mysql.com
9da0e8f5b4
ndb: added debug printout
2006-03-20 16:03:35 +01:00
gluh@eagle.intranet.mysql.r18.ru
820731c6ed
Fix for bug#15336 Partitions: crash if create table as select
...
added HA_EXTRA_WRITE_CACHE case to ha_partition::extra()
2006-03-20 18:58:21 +04:00
holyfoot@vva.(none)
936d596abc
Code #ifdef-ed
2006-03-20 18:46:13 +04:00
gluh@eagle.intranet.mysql.r18.ru
c0420a5c5e
Bug#14367 Partitions: crash if utf8 column
...
use part_info->item_free_list instead of thd->free_list during partition function parsing
2006-03-20 17:41:45 +04:00
holyfoot@vva.(none)
a68742f460
bug #17290 (sp with delete, create and rollback causes MySQLD core)
...
additional fixes
2006-03-20 17:30:01 +04:00
holyfoot@mysql.com
87a4e300a1
Merge bk@192.168.21.1:mysql-5.1-new
...
into mysql.com:/home/hf/work/mysql-5.1.clean
2006-03-20 15:24:14 +04:00
knielsen@mysql.com
95242e7186
Fix HPUX compilation.
2006-03-20 09:35:56 +01:00
hartmut@mysql.com
3b34159891
Merge mysql.com:/home/hartmut/projects/mysql/bk-clean/5.1
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.1/gcc41
2006-03-18 18:21:48 +01:00
hartmut@mysql.com
7f0430e134
gcc 4.1.0 compile fix (Bug #18332 )
2006-03-18 18:12:47 +01:00
mats@mysql.com
721ca0cccf
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b17400-mysql-5.1-new
2006-03-18 17:18:52 +01:00
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
holyfoot@mysql.com
d1909208a3
Merge bk@192.168.21.1:mysql-5.1-new
...
into mysql.com:/home/hf/work/mysql-5.1.clean
2006-03-18 18:51:17 +04:00
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
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
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
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