monty@mysql.com
ba99b6c565
Fixed compile errors (when compiling in debug mode)
2005-12-25 16:34:10 +02: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
brian@zim.(none)
dcbe5acb1b
See message in mysqlslap.c, but basically
...
1) Parsing now works
2) Options are safer, aka it doesn't kill the machine and it cleans up after itself
3) Option of --only-print added so that you can see what it does.
4) Tiny cleanup of the auto generate sql. A lot more needs to be done with this, for it to be very valuable. I suspect it doesn't work all that well.
5) Delimeter is now a single character. No good escaping going on.
6) You can now change which schema it is runninng against.
Now I think I can go make use of it!
Though I need to add support for a "only run this many inserts, divide by the number of clients connecting, to really test scaling"
2005-12-24 15:41:40 -08:00
lars@mysql.com
ad126d90e0
WL#1012: All changes as one single changeset.
...
This includes both code and test cases.
2005-12-22 06:39:02 +01:00
paul@snake-hub.snake.net
f5cc3fd619
mysql.cc:
...
Typo in help message.
2005-12-20 12:47:44 -06:00
msvensson@neptunus.(none)
94d05ebc37
Avoid implicit commits by using a different connection when creating/dropping sp's and views.
2005-12-20 17:06:20 +01:00
msvensson@neptunus.(none)
90bbcc9b4d
Store the each column from a multi column result set into a separate variable.
2005-12-20 15:34:58 +01:00
msvensson@neptunus.(none)
168520a026
Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2005-12-20 14:35:52 +01:00
msvensson@neptunus.(none)
b93eb20928
Bug #15845 New file "client/mysqlslap.c" break compilation on QNX, missing "sys/shm.h"
2005-12-20 12:56:48 +01:00
hartmut@mysql.com
84929a0f43
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.1
2005-12-13 19:50:23 +01:00
msvensson@neptunus.(none)
b38a183d62
Remove confusing printouts from expected to fail "system" commands
2005-12-13 18:47:34 +01:00
msvensson@neptunus.(none)
b5d805b2d6
Remove confusing printout
2005-12-13 18:10:53 +01:00
msvensson@neptunus.(none)
36c86a4df6
Fix tests after merge
...
Straighten out and comment behaviour for --require and --result in run_query
2005-12-13 18:07:13 +01:00
paul@snake-hub.snake.net
3a9c099ba3
Merge snake-hub.snake.net:/tmp/mysql-5.0
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2005-12-12 12:17:56 -06:00
paul@snake-hub.snake.net
c708d9140f
mysqltest.c:
...
Put options in proper order.
2005-12-12 12:15:25 -06:00
msvensson@neptunus.(none)
4bcb012bbc
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
2005-12-12 12:43:33 +01:00
msvensson@neptunus.(none)
8aeb3a1fba
Fix warnings for running with --view_protocol
2005-12-09 18:51:45 +01:00
msvensson@neptunus.(none)
fe2ec19039
WL#2930 mysqltest++
...
- Updated after valgrinding
2005-12-08 16:48:37 +01:00
msvensson@neptunus.(none)
d80516aa96
Fix memory leak
2005-12-07 14:52:37 +01:00
msvensson@neptunus.(none)
600a74b0d4
WL#2930
...
- Updated after review
2005-12-06 21:28:13 +01:00
hartmut@mysql.com
d2ec3d0c75
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.1
2005-12-06 14:19:17 +01:00
knielsen@mysql.com
2713a7e15e
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2005-12-05 18:01:44 +01:00
knielsen@mysql.com
17cab43fcf
Bug#15097: Missing \n in header printed by mysql --help when HAVE_READLINE
...
is not defined.
2005-12-05 12:12:08 +01:00
hartmut@mysql.com
9bd4f3225a
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.1
2005-12-05 11:32:51 +01:00
hartmut@mysql.com
45adda8fd1
added --server-id option to mysqlbinlog to filter for a certain server id
...
in the binlog only
2005-12-05 11:21:30 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
d88d8081da
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-12-04 15:34:47 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
669a12fdb0
A set of Netware related patches.
2005-12-04 15:02:06 +02:00
patg@krsna.patg.net
2c2c812846
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into krsna.patg.net:/home/patg/mysql-build/mysql-5.1-slap
2005-12-03 17:17:07 -08:00
patg@krsna.patg.net
9503c7e514
WORKLOG #2983 Post review fixes
2005-12-02 22:07:11 -08:00
jimw@mysql.com
01ac5172dd
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2005-12-01 15:14:51 -08:00
jimw@mysql.com
beed6147ad
Merge mysql.com:/home/jimw/my/mysql-4.1-13318
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-01 12:21:29 -08:00
patg@krsna.patg.net
094d91fdec
Worklog #2983 Mysqlslap load emulator tool and accompanied test, results
...
and modifications to mysql-test-run(.pl/.sh)
2005-11-29 16:02:21 -08:00
bar@mysql.com
23c4c3abc0
Merge mysql.com:/usr/home/bar/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2005-11-29 09:30:29 +04:00
brian@zim.(none)
22183f2342
Fixed typo where I did --replace-names intead of --replace.
...
Thanks Paul for pointing it out :)
2005-11-28 19:44:55 -08:00
jimw@mysql.com
5f7e5b46c6
Merge mysql.com:/home/jimw/my/mysql-4.1-5792
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-28 10:52:52 -08:00
brian@zim.(none)
802f32c1dd
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/mysql-5.1-new
2005-11-24 11:23:44 -08:00
brian@zim.(none)
33076b8782
Its funny, I am reading through the forums and someone asks "Can I please have a REPLACE INTO, instead an INSERT INTO?" and I remember how often I have used a sed script to modify MySQL dumps to have exactly that.
...
So, use --replace and instead of getting INSERT INTO you will INSTEAD get REPLACE INTO. Buyer beward, REPLACE is a MySQL SQL, so you will not end up with a dump that can be used for other databases.
Though I hear you could just use a sed line to modify it back :)
2005-11-24 09:56:40 -08:00
jimw@mysql.com
000d89b5e0
Fix values printed by mysqldump for empty blob fields when
...
--hex-blob is used. (Bug #13318 )
2005-11-23 17:31:44 -08:00
bell@sanja.is.com.ua
db8f03ebe8
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
2005-11-23 01:28:32 +02:00
bell@sanja.is.com.ua
7bd691f11e
Recursion support made for SP (BUG#10100).
2005-11-23 01:11:19 +02:00
kent@mysql.com
9b14ee2ebc
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
2005-11-22 01:17:06 +01:00
joerg@mysql.com
84bc725fb9
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-11-21 18:31:36 +01:00
joerg@mysql.com
b3b124f9e4
Merge the last 5.0.16 (Unix, Windows) and 5.0.16a (Netware) changes to the general tree.
2005-11-21 15:49:34 +01:00
aivanov@mysql.com
9a7efe36c6
Fixed BUG #14554 : mysqldump does not separate "ROW" and trigger
...
statement for tables created in the IGNORE_SPACE sql mode.
2005-11-21 13:36:48 +03:00
kent@mysql.com
bcdd552d6e
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
2005-11-19 11:20:52 +01:00
kent@mysql.com
bd80dc6c2e
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-11-19 11:11:09 +01:00
jamppa@suse9-x86.mysql.com
a50cc250ff
Netware specific changes for 5.0.16a
2005-11-18 18:25:46 +01:00
jimw@mysql.com
f8ce7bc01e
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-17 13:37:30 -08:00
jimw@mysql.com
2ffc7ff2a2
Update out-of-date URLs in 'help' text of mysql client. (Bug #14801 )
2005-11-11 15:23:04 -08:00
kent@mysql.com
b269caecb1
Additional "make distcheck" changes specific to 5.0
2005-11-09 11:56:04 +02:00