konstantin@mysql.com
fa5b4b55a0
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-19 15:23:01 +03:00
stewart@mysql.com
95e29a975a
small typo fixes
2006-01-19 22:50:54 +11:00
pem@mysql.com
3a753667dd
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug15658/mysql-5.0
2006-01-19 11:48:07 +01:00
holyfoot@deer.(none)
c03d025002
Embedded-server related tests fixes
2006-01-19 13:25:12 +04:00
bar@mysql.com
fd4ab36123
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.12448
2006-01-19 10:58:49 +04:00
cps@outpost.site
ce2eb6d8cb
WL1019: complete patch. Reapplied patch to the clean
...
tree to get rid of multiple typos in CS comments and
unify the patch.
2006-01-19 05:56:06 +03:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
5f147aa4e6
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
2006-01-18 16:11:35 -05:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
07e5c13e89
Bug fix
2006-01-18 16:09:25 -05:00
sergefp@mysql.com
6e5fb44453
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/psergey/mysql-5.1-ppruning-r5
2006-01-18 21:35:44 +03:00
pem@mysql.com
6fad448a49
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug14834/mysql-5.0
2006-01-18 18:18:04 +01:00
pem@mysql.com
5cf8418b10
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug14834/mysql-5.0
2006-01-18 17:09:23 +01:00
aivanov@mysql.com
5f7279d0d5
Applied patch recieved from Marko:
...
Make innodb_thread_concurrency 0 by default, and extend the usable
range from 0 to 1000 (0 disables the thread throttling).
2006-01-18 15:20:56 +03:00
mskold@mysql.com
1fb4202c6b
Disabled fast/drop index temporarily
2006-01-18 12:44:08 +01:00
sergefp@mysql.com
55380631cc
Manual merge
2006-01-18 14:09:08 +03:00
mskold@mysql.com
08d8691b40
disabled.def:
...
Disabled failing tests
mysql_priv.h:
Removed compiler warning
2006-01-18 10:56:07 +01:00
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
jmiller@mysql.com
8e5e0afae3
Updated test cases for testing Cluster Replication using the rpl* test cases
2006-01-18 00:45:23 +01:00
msvensson@neptunus.(none)
e55af5271c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-17 19:46:02 +01:00
konstantin@mysql.com
8d6c98ed90
Bug#15206: "Misleading message "No data to FETCH":
...
reword the misleading message.
2006-01-17 21:10:47 +03:00
msvensson@neptunus.(none)
f729ad7d39
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-17 19:08:07 +01:00
msvensson@neptunus.(none)
8b243b3799
Fix for connection not being added to connection pool if "disable_abort_on_error" was used.
2006-01-17 19:02:42 +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
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
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
1476b484c2
Additional fixes for WL#1892
2006-01-17 12:53:49 +01:00
pem@mysql.com
7817b99857
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug15231/mysql-5.0
2006-01-17 12:44:51 +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
pem@mysql.com
2f44b60752
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug14498/mysql-5.0
2006-01-17 10:04:11 +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
konstantin@mysql.com
4fd615abdb
A post-merge fix.
2006-01-17 01:22:01 +03:00
konstantin@mysql.com
c05b3f3bb1
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-17 01:18:00 +03:00
konstantin@mysql.com
739ba76d64
A fix for Bug#13337 "ps test fails if configure wo/ usc2"
2006-01-17 01:03:03 +03: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
konstantin@mysql.com
34c37d1ac9
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-17 00:44:43 +03:00
konstantin@mysql.com
3d16758311
A test case for Bug#6073 "ALTER TABLE minor glitch" (can't repeat)
2006-01-17 00:28:00 +03: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
konstantin@mysql.com
f693473fff
A test case for Bug#7670 "Loss of precision for some integer
...
values stored into DOUBLE column" (Can't repeat)
2006-01-16 22:31:13 +03: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
pem@mysql.com
5863337b8f
Post-merge fixes (BUG#14498)
2006-01-16 17:55:22 +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
andrey@lmy004.
7b2238d484
Merge
2006-01-16 16:21:41 +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