brian@zim.(none)
f5563028d3
Added option --lock-directory so that you can now syncronize several mysqlslap processes across several machines. Not perfect yet.
...
Added --slave option if you are trying to syncronize around one server using the lock-directory option plus NFS.
Added options to allow you to run several concurrency runs in one call. aka --concurrency="1, 8, 64, 128"
Time collection is now done in a finer grain manner, and is linked to the sync call (doesn't count the cost of the blocked processes that are setup to run).
2005-12-28 18:41:06 -08:00
msvensson@devsrv-b.mysql.com
0583507f88
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15775_part2/my51-bug15775_part2
...
into devsrv-b.mysql.com:/space/magnus/my51-bug15775_part2
2005-12-28 23:28:45 +01:00
ingo@mysql.com
b1214d232e
Bug#15591 Occasional test suite abort due to port in use
...
If the server is started with --port-open-timeout=#
retry to bind the TCP port if it fails with EADDRINUSE.
Use the new option in mysql-test-run.sh.
2005-12-28 20:30:57 +01:00
kent@mysql.com
eaffb7eb73
config-win.h:
...
Backported Windows MAX_INDEXES handling from 5.1
2005-12-28 18:35:22 +01:00
evgen@moonbone.local
5a3ce237af
Merge moonbone.local:/work/14583-bug-5.0-mysql
...
into moonbone.local:/work/14583-bug-5.1-new-mysql
2005-12-28 19:47:56 +03:00
msvensson@devsrv-b.mysql.com
45864dbf4b
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2
...
into devsrv-b.mysql.com:/space/magnus/my50-bug15775_part2
2005-12-28 17:37:28 +01:00
evgen@moonbone.local
45abf0dabd
Manual merge
2005-12-28 17:23:08 +03:00
msvensson@neptunus.(none)
6717a17fe7
Merge neptunus.(none):/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2
...
into neptunus.(none):/home/msvensson/mysql/bug15775_part2/my51-bug15775_part2
2005-12-28 14:46:00 +01:00
msvensson@neptunus.(none)
e1ef24e38c
Bug #15775 "drop user" command does not refresh acl_check_hosts
...
- Update patch for 5.0
- Added common function to be called when 'acl_users' has been modified
2005-12-28 14:43:50 +01:00
evgen@moonbone.local
535b23bec5
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/14583-bug-4.1-mysql
2005-12-28 16:00:10 +03:00
svoj@mysql.com
a3f445151f
WL#2575 - Fulltext: Parser plugin for FTS
...
Manual merge.
2005-12-28 16:05:30 +04:00
ramil@mysql.com
c1287769b9
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b15108
2005-12-28 14:16:46 +04:00
msvensson@neptunus.(none)
cdd1f5c6fc
Merge neptunus.(none):/home/msvensson/mysql/bug15775_part2/my41-bug15775_part2
...
into neptunus.(none):/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2
2005-12-28 09:31:40 +01:00
msvensson@neptunus.(none)
2fb6cb5a5a
BUG#15775 "drop user" command does not refresh acl_check_hosts
...
- DROP USER command didn't reload the acl_check_hosts cache causing subsequent
connect's via TCP to fail randomly.
- 4.1 version
2005-12-28 09:23:27 +01:00
ingo@mysql.com
eecf49999d
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug5390
2005-12-28 09:18:57 +01:00
stewart@mysql.com
70cc1a08af
build fixes for azio on systems without zutil.h
2005-12-28 15:33:48 +11:00
stewart@mysql.com
cac298e07b
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
...
into mysql.com:/home/stewart/Documents/MySQL/5.1/new
2005-12-28 13:55:59 +11:00
acurtis@xiphis.org
986cd20a0f
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into xiphis.org:/home/antony/work2/p4-bug15976
2005-12-27 11:15:56 -08:00
ingo@mysql.com
bd1b724bbf
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug5390
2005-12-27 19:25:54 +01:00
pekka@mysql.com
76bdccd08a
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/pekka/ndb/version/my50
2005-12-27 18:56:33 +01:00
pekka@mysql.com
79c7b62a55
ndb - post merge fix
2005-12-27 18:47:56 +01:00
pekka@mysql.com
56351ff012
Merge mysql.com:/space/pekka/ndb/version/my50
...
into mysql.com:/space/pekka/ndb/version/my51
2005-12-27 18:28:55 +01:00
evgen@moonbone.local
d91cbf34ff
Fix bug#14583
...
When InnoDB compares varchar field in ucs2 with given key using bin collation,
it calls my_strnncollsp_ucs2_bin() to perform comparison.
Because field length was lesser than length of key field should be padded
with trailing spaces in order to get correct result.
Because my_strnncollsp_ucs2_bin() was calling my_strnncollp_ucs2_bin(), which
doesn't pads field, wrong comparison result was returned. This results in
wrong result set.
my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
but using binary collation.
2005-12-27 20:16:59 +03:00
pekka@mysql.com
a4fc69dbfb
ndb - wl#2972 (5.0) fix detached trigger opType + new pgm test_event_merge
2005-12-27 16:57:50 +01:00
stewart@mysql.com
cb25f0f039
5.0 ndb build fix.
2005-12-28 01:32:03 +11:00
stewart@mysql.com
efbdf7b225
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
2005-12-28 00:57:18 +11:00
mats@mysql.com
3440170618
Bug#15942 (RBR ignored --binlog_ignore_db and tries to map table on slave for writes):
...
Added code to do the filtering (seems to have gone away).
2005-12-27 12:06:48 +01:00
ingo@mysql.com
44ef4989bb
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug5390
2005-12-27 10:36:19 +01:00
ingo@mysql.com
ef52a59418
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug5390
2005-12-27 10:31:00 +01:00
bell@sanja.is.com.ua
14384b8401
Avoiding conditional jump on uninitialized variable (BUG#14904).
2005-12-27 02:01:58 +02:00
ingo@mysql.com
b3803a490b
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug5390
2005-12-26 21:35:45 +01:00
sergefp@mysql.com
530cddb6cd
WL#2985: fix typo bug when partitioning is not compiled in
2005-12-26 19:46:06 +03:00
ingo@mysql.com
864f575615
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug5390
2005-12-26 14:22:13 +01:00
ramil@mysql.com
c4911a404a
Fix for SQLCOM_BINLOG_BASE64_EVENT related code.
2005-12-26 17:22:12 +04:00
psergey@pylon.mylan
26a23dcac9
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into pylon.mylan:/home/psergey/mysql-5.1-26dec-merge
2005-12-26 16:22:11 +03:00
sergefp@mysql.com
e6f3cb553d
Merge newbox:mysql-5.1-ppruning-r4
...
into mysql.com:/home/psergey/mysql-5.1-26dec-merge
2005-12-26 15:12:49 +03:00
sergefp@mysql.com
e597607cb8
Merge newbox:mysql-5.1-ppruning-r4
...
into pylon.mylan:/home/psergey/mysql-5.1-26dec-merge
2005-12-26 14:56:15 +03:00
ingo@mysql.com
c2b4e70eef
Merge mysql.com:/home/mydev/mysql-5.0-bug5390
...
into mysql.com:/home/mydev/mysql-5.1-bug5390
2005-12-26 10:50:41 +01:00
ingo@mysql.com
bd72782899
Merge mysql.com:/home/mydev/mysql-4.1-bug5390
...
into mysql.com:/home/mydev/mysql-5.0-bug5390
2005-12-26 10:32:54 +01:00
bar@mysql.com
cd56ec80bc
ignore:
...
added item_xmlfunc.cc
2005-12-26 12:16:28 +04:00
bar@mysql.com
a1153f45dd
.del-item_xmlfunc.cc~565ad32584ed96d4:
...
Delete: libmysqld/item_xmlfunc.cc
2005-12-26 12:13:53 +04:00
ramil@mysql.com
f6a61875f7
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b15108
2005-12-26 11:18:01 +04:00
sergefp@mysql.com
b8d762031f
add missing DROP TABLE [IF EXISTS] clauses
2005-12-26 10:16:36 +03:00
sergefp@mysql.com
81452dbcfc
WL#2985 "Partition pruning": fixes to post-review fixes: when modifying SEL_TREE::keys,
...
adjust SEL_TREE::keys_map appropriately.
2005-12-26 09:46:25 +03:00
sergefp@mysql.com
15780cb398
Fix typo bug in previous cset
2005-12-26 08:51:29 +03:00
sergefp@mysql.com
2a3943dbec
WL#2985 "Partition Pruning": post-review fixes:
...
- Added more comments.
- Added a RANGE_OPT_PARAM::remove_jump_scans flag that disables construction of index_merge
SEL_TREEs that represent unusable conditions like "key1part1<c1 OR key2part2<c2"
- make prune_partitions() function handle the case where range analysis produces a list of
index_merge trees (it turned out that this is possible, appropriate test case added).
- Other small fixes.
2005-12-26 08:40:09 +03:00
monty@mysql.com
88bcd74d76
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/my/mysql-5.1
2005-12-25 16:35:15 +02:00
monty@mysql.com
ba99b6c565
Fixed compile errors (when compiling in debug mode)
2005-12-25 16:34:10 +02:00
acurtis@xiphis.org
9aaa8a81eb
Bug#15976: Multiply warnings about unfreed memory
...
leaks caused by Archive storage engine not closing files and
storage engines not receiving panic() during shutdown
2005-12-25 03:29:49 -08:00
brian@zim.(none)
49419b0b99
New option to run multiple engines through the same test:
...
--engine="myisam,archive"
--number-of-rows has been removed for the time being and replaced with
option to allow you to just repeat multiple time all of the inserts you specifed with data. When number-of-rows-returns it will be instead used for averaging rows while growing concurrency.
Returned stats now has accurent row and query counts since it includes a multiple for the rows and queries added.
Parser is now a touch smarter and understands end of file issues if you have a delimiter at the end of the file.
2005-12-25 02:03:53 -08:00