bar@mysql.com
4e4b37a8ef
loaddata.result, loaddata.test:
...
Adding test case.
sql_yacc.yy:
Adding TEXT_STRING_filesystem, which
converts from character_set_client to
character_set_conversion.
Replacing TEXT_STRING_sys to TEXT_STRING_filesystem
in LOAD DATA and SELECT INTO OUTFILE contexts.
sql_class.h, sql_class.cc:
Adding character_set_filesystem variable,
and charset_is_character_set_filesystem
flag (to avoid conversion when it's not necessary).
set_var.h, set_var.cc:
Adding sys_var_character_set_filesystem
mysqld.cc:
Adding --character-set-filesystem startup option.
2006-01-18 12:55:38 +04:00
bar@mysql.com
0e665a7aa5
sql_show.cc:
...
Don't display charsets/collations with HIDDEN flag.
ctype-utf8.c:
Adding HIDDEN flag to "filename"
Changeing ID to 17 which was previosly
used by deprecated "win1251", removed in 4.1.
charset-def.c:
Adding "filename" as a hidden charset, for test purposes.
m_ctype.h:
Adding MY_CS_HIDDEN flag,
to hide charsets and collations from
being displayed in SHOW.
2006-01-18 12:27:02 +04:00
mskold@mysql.com
b508fab071
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-01-18 09:12:56 +01:00
knielsen@mysql.com
6971691dc5
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/mysql-5.1-relmerge
2006-01-18 09:12:10 +01:00
joerg@debian.(none)
2d5ad673ce
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into debian.(none):/M51/mysql-5.1
2006-01-18 08:56:46 +01:00
jmiller@mysql.com
8e5e0afae3
Updated test cases for testing Cluster Replication using the rpl* test cases
2006-01-18 00:45:23 +01:00
knielsen@mysql.com
92e1557dce
C++ comments in C files are not portable.
2006-01-17 21:38:19 +01:00
mskold@mysql.com
b35d591095
Post review fixes of WL#1892
2006-01-17 18:35:17 +01:00
knielsen@mysql.com
6de2c13c2f
Manual merge.
2006-01-17 18:35:17 +01:00
joerg@debian.(none)
c55017741a
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into debian.(none):/M51/mysql-5.1
2006-01-17 18:35:16 +01:00
mskold@mysql.com
0b32dbca38
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-01-17 18:35:16 +01:00
knielsen@mysql.com
2ad568d421
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/mysql-5.1-relmerge
2006-01-17 18:35:16 +01:00
tomas@poseidon.ndb.mysql.com
b3658d6731
fix my_compress/zlib link error
2006-01-17 18:35:15 +01:00
mskold@mysql.com
aae4a997d4
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-01-17 18:35:15 +01:00
joerg@mysql.com
3d3c9ba4fa
Merge mysql.com:/M51/clone-5.1 into mysql.com:/M51/mysql-5.1
2006-01-17 18:35:14 +01:00
joerg@mysql.com
17cdeb0489
Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/merge-5.1
2006-01-17 18:35:13 +01:00
serg@serg.mylan
442e328ee9
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-17 18:35:13 +01:00
joerg@mysql.com
be46467b1f
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/M51/mysql-5.1
2006-01-17 18:35:12 +01:00
tomas@poseidon.ndb.mysql.com
246cccc1a5
fix compile error
2006-01-17 18:35:11 +01:00
tomas@poseidon.ndb.mysql.com
933a87a943
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-01-17 18:35:10 +01:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
fb79504889
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2747-push
2006-01-17 12:35:09 -05:00
tomas@poseidon.ndb.mysql.com
368f4d86e3
fix some options to ndb tools that seem to be disturbing some shells
2006-01-17 17:22:04 +01:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
0f74283ba1
Merge c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
...
into c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2604-push
2006-01-17 11:22:03 -05:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
a9ab4f9cb8
Fix for auto-partitioned tables and PARTITION BY KEY() tables
2006-01-17 11:19:48 -05:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
b809a9d027
Merge c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
...
into c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2604-push
2006-01-17 09:36:55 -05:00
mskold@mysql.com
c18c667154
Resetting of alter table marker in NDB_SHARE (WL#1892)
2006-01-17 13:59:36 +01:00
joerg@mysql.com
728c67466d
Manual merge of 5.1.5 build changes into the general tree.
2006-01-17 13:32:28 +01:00
mskold@mysql.com
1476b484c2
Additional fixes for WL#1892
2006-01-17 12:53:49 +01:00
tomas@poseidon.ndb.mysql.com
6ccfda09c9
added missing setting of ndb environment variables used in tests
2006-01-17 10:48:47 +01:00
mikron@c-1e0be253.1238-1-64736c10.cust.bredbandsbolaget.se
6bf5c9113d
WL #2747 : Fix such that backup and restore works for user defined
...
partitioned tables in NDB
2006-01-17 09:25:12 +01:00
mikron@c-1e0be253.1238-1-64736c10.cust.bredbandsbolaget.se
e802a94284
WL #2604 : Partition Management
...
Optimised version of ADD/DROP/REORGANIZE partitions for
non-NDB storage engines.
New syntax to handle REBUILD/OPTIMIZE/ANALYZE/CHECK/REPAIR partitions
Quite a few bug fixes
2006-01-17 08:40:00 +01:00
tomas@poseidon.ndb.mysql.com
9d4882d51d
added option to run all ndb tests only
2006-01-17 08:25:52 +01:00
tomas@poseidon.ndb.mysql.com
31596d5456
added assert for when ndb share is not released as it should
...
+ corrected the bugs in this resuling from mysql-test-run
+removed some debug printouts
2006-01-17 07:36:50 +01:00
jmiller@mysql.com
4d885f5c03
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-16 22:48:58 +01:00
tomas@poseidon.ndb.mysql.com
f569266bfa
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-01-16 22:48:57 +01:00
tomas@poseidon.ndb.mysql.com
0d8ed9ba04
added option to force ndb to be run for all tests
2006-01-16 22:47:19 +01:00
reggie@linux.site
3573c2cf47
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into linux.site:/home/reggie/work/mysql-5.1-bug15968
2006-01-16 15:23:29 -06:00
joerg@mysql.com
b2f6d4f574
Merge mysql.com:/M50/merge-5.0 into mysql.com:/M51/merge-5.1
2006-01-16 20:21:42 +01:00
svoj@april.(none)
74c475b23d
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into april.(none):/home/svoj/devel/mysql/BUG14194/mysql-5.1-new
2006-01-16 22:27:36 +04:00
svoj@april.(none)
237e80670a
Merge april.(none):/home/svoj/devel/mysql/BUG13835/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/BUG13835/mysql-5.1-new
2006-01-16 21:42:09 +04:00
SergeyV@selena.
94b26428c3
Changes to make mysqlslap buildable and runable on win32.
2006-01-16 19:35:01 +03:00
joerg@mysql.com
5da306b57e
extra/comp_err.c : Fix a merge error.
2006-01-16 17:23:39 +01:00
evgen@moonbone.local
c435433c61
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into moonbone.local:/work/15347-bug-5.1-new-mysql
2006-01-16 19:01:57 +03:00
joerg@mysql.com
fa91e05bf5
Manual merge of the fix for bug#16106.
...
Currently failing tests (for me) in non-debug build:
blackhole fulltext fulltext_cache fulltext_left_join fulltext_multi
2006-01-16 16:48:05 +01:00
knielsen@mysql.com
cceb3ed1d7
Merge mysql.com:/usr/local/mysql/mysql-5.x-win-test-fixes
...
into mysql.com:/usr/local/mysql/mysql-5.1-win-test-fixes
2006-01-16 16:04:53 +01:00
SergeyV@selena.
c0bf54d568
Fixes problem introduced by non-portable thread library definition in client
...
makefile.am. Instead of adding lpthread directly it is added $CLIENT_THREAD_LIBS,
which is evaluated during configure.
2006-01-16 17:28:24 +03:00
knielsen@mysql.com
1b75cf8aa6
Two minor fixes to be able to run tests from within a Windows Max
...
build directory.
2006-01-16 15:25:15 +01:00
serg@serg.mylan
5b9b3ccb4c
only use "public" types in plugin API
2006-01-16 15:17:45 +01:00
evgen@moonbone.local
7f0aa55e36
Manually merged
2006-01-16 16:57:15 +03:00
jonas@perch.ndb.mysql.com
068557b294
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-01-16 13:15:12 +01:00