SergeyV@selena.
32e68098a9
Post review updates for win32 port of mysqlslap
2006-01-20 18:20:03 +03:00
paul@snake-hub.snake.net
9d3f0364a4
mysqlslap.c:
...
Fix incorrect option description.
2006-01-19 12:33:51 -06:00
paul@snake-hub.snake.net
8cefc4ce5b
mysqlslap.c:
...
Put options in standard order: --help first, then lexically.
Rename --number-of-query to --number-of-queries.
2006-01-18 20:27:07 -06:00
serg@serg.mylan
87f685edef
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-01-17 21:12:24 +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
serg@serg.mylan
ae3d815b41
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-01-16 18:09:04 +01:00
SergeyV@selena.
94b26428c3
Changes to make mysqlslap buildable and runable on win32.
2006-01-16 19:35:01 +03: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
sasha@asksasha.com
aa234851f0
patch for replace_regex in mysqltest
2006-01-13 12:25:51 -07:00
anozdrin@mysql.com
acbacd921f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 19:46:38 +03:00
tomas@poseidon.ndb.mysql.com
fb52fe5cf5
fix compile error on hp-ux setenv->putenv
...
print slave port as well
2006-01-13 17:44:37 +01:00
anozdrin@mysql.com
b1705ae5c4
Merge BUG#15110 from 5.0 into 5.1.
...
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110
into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 19:09:27 +03:00
tomas@poseidon.ndb.mysql.com
e648a8fe52
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/v7
2006-01-13 03:17:09 +01:00
brian@zim.tangent.org
0f50bfa486
Fixed bug #16167
...
Added --use-threads option for porting to Windows.
2006-01-12 12:27:25 -08:00
tomas@poseidon.ndb.mysql.com
4b731ddfb4
wl2325 wl2324
2006-01-12 19:51:02 +01:00
brian@zim.tangent.org
ca560db79f
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.tangent.org:/home/brian/mysql/slap-5.1
2006-01-12 09:55:22 -08:00
brian@zim.tangent.org
19dbafc28c
Adding a --use-threads options which I believe will allow it to be ported to windows.
2006-01-11 21:30:52 -08:00
msvensson@neptunus.(none)
4b913614fc
Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-11 11:24:57 +01:00
msvensson@neptunus.(none)
4bcc1845eb
Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
...
into neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup
2006-01-11 11:21:23 +01:00
msvensson@neptunus.(none)
f60f757689
Add comments that groups and describes the inits
2006-01-11 11:10:58 +01:00
msvensson@neptunus.(none)
f4ad824df9
Remove obsolete comment
2006-01-11 11:07:17 +01:00
msvensson@neptunus.(none)
2f48e4f1dc
Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero.
2006-01-11 11:06:26 +01:00
msvensson@neptunus.(none)
d42d399464
Disable code for "let" to assign each column from query to it's own variable
2006-01-11 00:24:57 +01:00
anozdrin@mysql.com
b04b851ef9
Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
...
There are two main idea of this fix:
- introduce a common function for server and client to split user value
(<user name>@<host name>) into user name and host name parts;
- dump DEFINER clause in correct format in mysqldump.
2006-01-11 02:07:40 +03:00
msvensson@neptunus.(none)
4a000ba857
Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-small_fix
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 16:00:37 +01:00
msvensson@neptunus.(none)
a09473e652
Fix for crashing mysqltest
2006-01-10 15:56:30 +01:00
msvensson@neptunus.(none)
5a9b31e940
Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 14:56:46 +01:00
msvensson@neptunus.(none)
b10bed08ce
Fix mysqltest crash problem
2006-01-10 14:55:39 +01:00
msvensson@neptunus.(none)
e17d969618
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 08:00:17 +01:00
msvensson@neptunus.(none)
e0d3410a3e
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
2006-01-09 20:12:18 +01:00
paul@snake-hub.snake.net
da8030ff7a
mysqlbinlog.cc:
...
Put options in standard order: help first, then lexically,
then variables.
2006-01-04 13:37:59 -06:00
serg@serg.mylan
30c09d6dc0
merged
2006-01-03 18:12:03 +01:00
serg@serg.mylan
14f94dc0ca
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
knielsen@mysql.com
06a49eca23
Fix memory problem: Both the allocation and pointer arithmetics on the
...
head_sptr array was wrong.
2006-01-03 11:09:18 +01:00
knielsen@mysql.com
0e41800311
Fix compile failure, reapply changeset "05/12/29 15:37:36 sergefp@mysql.com"
...
apparently lost in merge.
2006-01-02 13:19:13 +01:00
brian@zim.(none)
4c9d2ff360
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/slap-5.1
2006-01-01 20:27:24 -08:00
brian@zim.(none)
522a62446c
Cleaned up memory allocation to be a little more staight forward (though I suspect someone will hate my sizeof() increment).
...
Nothing really to see here. Updated comments in code.
More comments are probably needed, but isn't that always the case?
2006-01-01 20:08:45 -08:00
brian@zim.(none)
d4a3fe6e68
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/slap-5.1
2006-01-01 16:47:03 -08:00
brian@zim.(none)
7ce1981bbd
Now uses a single pass testing loop. Dual pass made no sense.
...
Now does averaging when running iterations.
Realligned a bunch of code and continued to remove global variables.
Added CSV output along with printable.
Structures are now provided for print options so adding XML, HTML, ... should now be trivial.
2006-01-01 16:40:02 -08:00
knielsen@mysql.com
9cfa1def8e
Don't use C++ style (//) comments in C source (breaks compilation on aix52).
2006-01-02 01:35:30 +01:00
serg@serg.mylan
a2689bae45
after pull fixes
2005-12-29 21:29:02 +01:00
sergefp@mysql.com
a590401007
Fix the compile failure introduced by the previous cset.
2005-12-29 15:37:36 +03:00
msvensson@neptunus.(none)
1faa256931
Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2005-12-29 09:55:09 +01:00
msvensson@neptunus.(none)
43a559ac70
Improved error message for failing with wrong error
2005-12-29 09:48:43 +01:00
brian@zim.(none)
ad071bec57
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/slap-5.1
2005-12-28 19:40:24 -08:00
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
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
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
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