1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Commit Graph

374 Commits

Author SHA1 Message Date
unknown
0592560eb5 Fix syntax error
client/mysqlslap.c:
  Remove the %s, no string to print
2006-04-11 22:10:11 +02:00
msvensson@neptunus.(none)
0bdb9ff547 Fix syntax error 2006-04-11 22:10:11 +02:00
unknown
faac43dfb9 Bug#17478 mysqlslap not issuing any queries
- Add more printouts it depending on verbose level
 - New common function 'run_query' to be used when executing a query


client/mysqlslap.c:
  Seed random number generator after options handling
  Make common function 'run_query' to take care of "opt_print_only" and "opt_verbose" level
  Better error message when failing to connect to MySQL Server
  Message when turning off "preserve-schema"
  Print auto generated statmements
  Print queries if verbose >= 2
  Print "connected" if verbose >= 3
2006-04-11 22:04:08 +02:00
msvensson@neptunus.(none)
5848a4276d Bug#17478 mysqlslap not issuing any queries
- Add more printouts it depending on verbose level
 - New common function 'run_query' to be used when executing a query
2006-04-11 22:04:08 +02:00
unknown
6c09775a04 Don't use the MYSQL* returned from mysql_real_connect to overwrite the already initalised mysql variable
client/mysqlslap.c:
  Only use the MYSQL* returned from mysql_reqal_connect as an indicator wether the connect was successfull or not.
  As the manual says about the return value from mysql_real_connect: "A MYSQL* connection handle if the connection
  was successful, NULL if the connection was unsuccessful. For a successful connection, the 
  return value is the same as the value of the first parameter."
2006-04-11 20:49:31 +02:00
msvensson@neptunus.(none)
c8c8041804 Don't use the MYSQL* returned from mysql_real_connect to overwrite the already initalised mysql variable 2006-04-11 20:49:31 +02:00
unknown
b924ee8d81 Behavior change to preserve schema unless you specify autogenerated SQL or create values.
client/mysqlslap.c:
  Behavior change
2006-03-28 17:59:11 -08:00
brian@zim.(none)
097804fbdb Behavior change to preserve schema unless you specify autogenerated SQL or create values. 2006-03-28 17:59:11 -08:00
unknown
212e79136b netware doesnt use fork 2006-03-27 12:25:01 -05:00
bpontz@shasta.mysql.com
2d14a5e560 netware doesnt use fork 2006-03-27 12:25:01 -05:00
unknown
b89bbaac9d This is a patch to test the default schema location.
client/mysqlslap.c:
  Formating
mysql-test/t/mysqlslap.test:
  Adding test to test for using non-default  database.
2006-03-10 08:54:12 -08:00
brian@zim.(none)
07bd25c9f5 This is a patch to test the default schema location. 2006-03-10 08:54:12 -08:00
unknown
da383890ae crazy - for the last week mysqlslap.test was generating 400 sigsegvs
per run, failing ALL mysql_real_connect() calls - nobody noticed,
the test always appeared to "pass".
2006-03-02 10:48:54 +01:00
serg@serg.mylan
c7513d18db crazy - for the last week mysqlslap.test was generating 400 sigsegvs
per run, failing ALL mysql_real_connect() calls - nobody noticed,
the test always appeared to "pass".
2006-03-02 10:48:54 +01:00
unknown
dc9363648b This patch handles compiles with threads, namely if you don't have pthreads it will remove support for threads in the applications (and it is fixed in such a way that tests won't break).
client/mysqlimport.c:
  Add in flags to support compiles with no thread support.
client/mysqlslap.c:
  Add support to source code to compile without threads.
2006-02-25 18:03:11 -08:00
brian@zim.(none)
7234f79c4a This patch handles compiles with threads, namely if you don't have pthreads it will remove support for threads in the applications (and it is fixed in such a way that tests won't break). 2006-02-25 18:03:11 -08:00
unknown
99502158b7 Fixed some threading issues that Guilhem found (and its what I get for copy and pasting from elsewhere without thinking about it). Added depracted messages to BACKUP, RESTORE, and LOAD TABLE FROM MASTER (which doesn't work well).
client/Makefile.am:
  Added threaded libary.
client/mysqlimport.c:
  Updated logic to use threaded libmysql correctly.
client/mysqlslap.c:
  Modified how threads were working.
mysql-test/r/backup.result:
  Added deprecated messages.
sql/sql_yacc.yy:
  Added deprecated messages to RESTORE, BACKUP, and LOAD TABLE FROM MASTER
2006-02-19 09:41:59 -08:00
brian@zim.tangent.org
faa1b42989 Fixed some threading issues that Guilhem found (and its what I get for copy and pasting from elsewhere without thinking about it). Added depracted messages to BACKUP, RESTORE, and LOAD TABLE FROM MASTER (which doesn't work well). 2006-02-19 09:41:59 -08:00
unknown
832dd46f49 Automerge
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
client/mysqlslap.c:
  SCCS merged
configure.in:
  SCCS merged
libmysql/libmysql.c:
  SCCS merged
mysys/my_init.c:
  SCCS merged
2006-02-15 00:01:46 +01:00
serg@serg.mylan
48b8e842ca Automerge 2006-02-15 00:01:46 +01:00
unknown
d3ee9abf2a dbug changes:
1. dbug state is now local to a thread
2. new macros: DBUG_EXPLAIN, DBUG_EXPLAIN_INITIAL,
   DBUG_SET, DBUG_SET_INITIAL, DBUG_EVALUATE, DBUG_EVALUATE_IF
3. macros are do{}while(0) wrapped
4. incremental modifications to the dbug state (e.g. "+d,info:-t")
5. dbug code cleanup, style fixes
6. _db_on_ and DEBUGGER_ON/OFF removed
7. rest of MySQL code fixed because of 3 (missing ;) and 6
8. dbug manual updated
9. server variable @@debug (global and local) to control dbug from SQL!
a. -#T to print timestamps in the log


BitKeeper/deleted/.del-readme.prof~2f3bae1550a0038d:
  Delete: dbug/readme.prof
client/mysqlslap.c:
  typo fixed
configure.in:
  test for sleep() too
dbug/dbug.c:
  thread local dbug settings
  DBUG_EXPLAIN,DBUG_EXPLAIN_INITIAL,DBUG_SET,DBUG_SET_INITIAL
  style changes to be more in line with MySQL code
  cleanup (many mallocs removed)
  incremental modification of dbug state (e.g. DBUG_PUSH("+t:-d,info"))
  DBUG_SET, _db_explain_
  -#T
dbug/monty.doc:
  obsolete and duplicate docs removed
dbug/user.r:
  new features documented
include/my_dbug.h:
  correct do{}while wrapping
  thread local dbug settings
  DBUG_EXPLAIN,DBUG_EXPLAIN_INITIAL,DBUG_SET,DBUG_SET_INITIAL
  DBUG_EVALUATE,DBUG_EVALUATE_IF
libmysql/libmysql.c:
  remove _db_on_ and DEBUGGER_ON/OFF
mysys/my_init.c:
  missed DBUG_RETURN
mysys/my_thr_init.c:
  bugfix - transaction id's are unsigned
mysys/testhash.c:
  remove _db_on_ and DEBUGGER_ON/OFF
sql/ha_myisammrg.cc:
  missed ;
sql/ha_ndbcluster.cc:
  remove _db_on_ and DEBUGGER_ON/OFF
  missed ;
sql/ha_ndbcluster_binlog.cc:
  remove _db_on_ and DEBUGGER_ON/OFF
  missed ;
sql/item_cmpfunc.cc:
  missed ;
sql/lock.cc:
  missed DBUG_RETURN
sql/log_event.cc:
  missed ;
sql/mysqld.cc:
  remove _db_on_ and DEBUGGER_ON/OFF
  missed ;
  DBUG_SET_INITIAL
sql/opt_range.cc:
  remove _db_on_ and DEBUGGER_ON/OFF
sql/set_var.cc:
  class sys_var_thd_dbug and "debug" server variable
sql/set_var.h:
  class sys_var_thd_dbug and "debug" server variable
sql/slave.cc:
  missed ;
sql/sql_cache.cc:
  missed ;
sql/sql_plugin.cc:
  missed ;
sql/sql_select.cc:
  remove _db_on_ and DEBUGGER_ON/OFF
storage/heap/hp_test2.c:
  remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/ft_eval.c:
  remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/ft_test1.c:
  remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/mi_open.c:
  remove _db_on_ and DEBUGGER_ON/OFF
  missed ;
storage/myisam/mi_test1.c:
  remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/mi_test2.c:
  remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/mi_test3.c:
  remove _db_on_ and DEBUGGER_ON/OFF
storage/ndb/src/ndbapi/DictCache.cpp:
  missed ;
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  missed ;
tests/mysql_client_test.c:
  remove _db_on_ and DEBUGGER_ON/OFF
2006-02-14 22:36:11 +01:00
serg@serg.mylan
63cfd11859 dbug changes:
1. dbug state is now local to a thread
2. new macros: DBUG_EXPLAIN, DBUG_EXPLAIN_INITIAL,
   DBUG_SET, DBUG_SET_INITIAL, DBUG_EVALUATE, DBUG_EVALUATE_IF
3. macros are do{}while(0) wrapped
4. incremental modifications to the dbug state (e.g. "+d,info:-t")
5. dbug code cleanup, style fixes
6. _db_on_ and DEBUGGER_ON/OFF removed
7. rest of MySQL code fixed because of 3 (missing ;) and 6
8. dbug manual updated
9. server variable @@debug (global and local) to control dbug from SQL!
a. -#T to print timestamps in the log
2006-02-14 22:36:11 +01:00
unknown
aefe5da549 Fixed comments bug#17239
client/mysqlslap.c:
  Fixed comments.
2006-02-13 19:09:10 -08:00
brian@zim.tangent.org
abf4f17761 Fixed comments bug#17239 2006-02-13 19:09:10 -08:00
unknown
456524c060 Rename of my_strdup_with_lenght to match the more common "strndup" method. Soo its now my_strndup().
my_stat() gettinng the correct parameter list may be next :)


client/mysqlslap.c:
  rename
extra/comp_err.c:
  rename
include/my_sys.h:
  replace
mysys/mf_tempdir.c:
  replace
mysys/my_malloc.c:
  replace
mysys/safemalloc.c:
  replace
sql/ha_federated.cc:
  replace
sql/log_event.cc:
  replace
sql/set_var.cc:
  replace
sql/set_var.h:
  replace
storage/myisam/ft_stopwords.c:
  replace
2006-01-25 19:54:42 -08:00
brian@zim.tangent.org
570bffe8c7 Rename of my_strdup_with_lenght to match the more common "strndup" method. Soo its now my_strndup().
my_stat() gettinng the correct parameter list may be next :)
2006-01-25 19:54:42 -08:00
unknown
61946d225a Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  selena.:H:/MYSQL/src/#00000-mysql-5.1


client/mysqlslap.c:
  Auto merged
configure.in:
  Auto merged
VC++Files/mysql.sln:
  manual merge
2006-01-20 18:40:02 +03:00
SergeyV@selena.
b4055d2486 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  selena.:H:/MYSQL/src/#00000-mysql-5.1
2006-01-20 18:40:02 +03:00
unknown
94ea98832a Post review updates for win32 port of mysqlslap 2006-01-20 18:20:03 +03:00
SergeyV@selena.
32e68098a9 Post review updates for win32 port of mysqlslap 2006-01-20 18:20:03 +03:00
unknown
a32426919a mysqlslap.c:
Fix incorrect option description.


client/mysqlslap.c:
  Fix incorrect option description.
2006-01-19 12:33:51 -06:00
paul@snake-hub.snake.net
9d3f0364a4 mysqlslap.c:
Fix incorrect option description.
2006-01-19 12:33:51 -06:00
unknown
40d4fcfc62 mysqlslap.c:
Put options in standard order: --help first, then lexically.
  Rename --number-of-query to --number-of-queries.


client/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
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
unknown
84c3b534a0 Changes to make mysqlslap buildable and runable on win32.
VC++Files/client/mysqlslap.vcproj:
  Added references to mysqlclient.lib & mysys.lib for mysqlslap build on win32.
VC++Files/mysql.sln:
  mysqlslap.vcproj is added into mysql.sln
client/mysqlslap.c:
  Win32 specific code is added to build & run mysqlslap successfully on win32.
2006-01-16 19:35:01 +03:00
SergeyV@selena.
94b26428c3 Changes to make mysqlslap buildable and runable on win32. 2006-01-16 19:35:01 +03:00
unknown
88ece282f5 Fixed bug #16167
Added --use-threads option for porting to Windows. 


client/mysqlslap.c:
  Addinng thread option for porting to windows (second piece of code)
  Also added flush call to fix one bug
mysql-test/r/mysqlslap.result:
  New results
mysql-test/t/disabled.def:
  Bug 16167 should not be fixed
mysql-test/t/mysqlslap.test:
  Added test for new use-threads option
2006-01-12 12:27:25 -08: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
unknown
927c7b262b Adding a --use-threads options which I believe will allow it to be ported to windows.
client/Makefile.am:
  Adding pthread flag
client/client_priv.h:
  New option to use theads.
client/mysqlslap.c:
  Adding support to optionally use threads (which should allow it to work with windows)
2006-01-11 21:30:52 -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
unknown
a74472c849 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
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
unknown
d68fdc0e84 Fix compile failure, reapply changeset "05/12/29 15:37:36 sergefp@mysql.com"
apparently lost in merge.


client/mysqlslap.c:
  Fix compile failure.
2006-01-02 13:19:13 +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
unknown
ad00c02079 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/slap-5.1


client/mysqlslap.c:
  Merge of comments change
2006-01-01 20:27:24 -08: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
unknown
9b9af86ac0 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?


client/mysqlslap.c:
  Updated docs. 
  Removed complicated malloc calls with a single malloc. Cleaned up the way statements were be free'd (aka its now a function instead of a bunch of copy/paste).
  Removed older and not so accurate timediff() call. Cleaned up call to parse out concurrency.
mysql-test/t/mysqlslap.test:
  Edited the tests to make sure we check default concurrency (we can't test concurrency normally since in theory the results could be random).
  You will noticed that the result was not changed.
2006-01-01 20:08:45 -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
unknown
dcab4ab1ad Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/slap-5.1


client/mysqlslap.c:
  Resolve conflict
2006-01-01 16:47:03 -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