client/mysqlslap.c:
compilation errors
include/plugin.h:
comments corrected
sql/sql_plugin.cc:
LEX_STRING instead of char*,
MYSQL_HANDLERTON_INTERFACE_VERSION instead of 0x0000
sql/sql_plugin.h:
LEX_STRING instead of char*
sql/sql_show.cc:
LEX_STRING instead of char*.
STRING_WITH_LEN works only on string literals, not on expressions
client/mysqltest.c:
Display the error message along with error number when query fails with wrong expected error.
mysql-test/r/mysqltest.result:
Update test results
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).
client/Makefile.am:
Adding my_lock compile bits so we can have locking.
client/client_priv.h:
New options for lock directory, number of query, number of rows and slave status.
client/mysqlslap.c:
Updates for lock-directory.
Simplified fork() code that is called. It should be possible to build now a version that used threads if someone wanted to port to windows).
You can now specify several concurrency runs in one pass of the code.
into mysql.com:/home/stewart/Documents/MySQL/5.1/new
client/mysqltest.c:
Auto merged
sql/item.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
storage/myisam/mi_create.c:
Auto merged
storage/myisam/mi_delete.c:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
strings/decimal.c:
Auto merged
configure.in:
remove 5.0 version increement
sql/ha_archive.cc:
merge
sql/handler.cc:
merge
sql/mysqld.cc:
merge
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
client/mysql.cc:
Auto merged
myisam/mi_delete.c:
Auto merged
mysql-test/r/fulltext2.result:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
sql/mysqld.cc:
Auto merged
--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.
client/client_priv.h:
New options
client/mysqlslap.c:
Modifications for doing repeated tests.
mysql-test/r/mysqlslap.result:
New result file
mysql-test/t/mysqlslap.test:
Changes in tests to make sure concurrency failures would not occur.
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"
client/client_priv.h:
Added new options for mysqlslap
client/mysqlslap.c:
Lots of cleanup.
Highlights:
1) Parsing now works much better, though I suspect escaping issues still exist. All strings are parsed into a typedef called statement. This is a linked structure with each statement held in it. I added options for length so that when the time comes to fix this for binary data the guts of the main executing loop will not need to be changed
2) Cleaned up options so that it will not destroy data by default and will clean up itself by default. So no leaving around of gobs of data.
3) Added option of --only-print to see the SQL it would have executed
4) Parsing handles whitespace trick (which will come back to bite someone I expect)
5) Delimeter is now a single character
6) All memory allocated should now be freed.
7) Set defaults so that only a single run will occur if none are given.
8) You can now change the schema that it runs against.
mysql-test/r/information_schema.result:
Fix for Antony's merge
mysql-test/r/mysqlslap.result:
New result set
More testing
mysql-test/t/mysqlslap.test:
More testing
client/mysqltest.c:
Update var_query_set to store every column from a query into a separate variable.
The whole result will still be stored as tab separated string in the var that let points at.
mysql-test/r/mysqltest.result:
Add test results
mysql-test/t/mysqltest.test:
Add tests for "one variable for each column" from let.
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysql-test/t/mysqltest.test:
Check with test ! -e that no out file exists
client/mysqltest.c:
Add missing DBUG_VOID_RETURN
Log failure to run "system" into result log
Add DBUG_PRINT for the sleep value used in do_sleep
mysql-test/r/mysqltest.result:
Update test results
mysql-test/t/mysqltest.test:
Mask outpu from failed system command
Straighten out and comment behaviour for --require and --result in run_query
client/mysqltest.c:
If --require or --result has been provided for a query command->record_file file be set.
In that case it should either dump to file if recording or check with content in file if running.
mysql-test/r/mysqltest.result:
Fix up tests and results after merge
mysql-test/t/mysqltest.test:
Fix up tests and results after merge
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/union.test:
Auto merged
mysql-test/r/mysqltest.result:
Manual merge
mysql-test/t/mysqltest.test:
Manual merge
- Updated after valgrinding
client/mysqltest.c:
Move initialisation of dynamic strings to top of function so that variables are always inited before free
The workaround for 15518 moved to last in function
Add check for "--" comments without any comment,. to avoid read of uninit memory
mysql-test/mysql-test-run.sh:
Add printout of valgrind errors from mysqltest when test with valgrind has completed
- Updated after review
client/mysqltest.c:
Remove the mysterious 1024, sed when calculating max_length for bind columns
Change affected_rows variables to use ulonglong
A little more fiddling with warnings in ps mode needed
Add temporary workaround for bug#15518
Use ulong instead of "unsigned long"
Print verbose_msg when failure to create view or sp
Updated cheks for "zero size result file" and "no queries executed but result file found"
The test must produce some output
mysql-test/include/have_multi_ndb.inc:
Use --require <result_file> instead of @r <result_file>
mysql-test/r/mysqltest.result:
Update resulfiles
mysql-test/t/init_file.test:
Add "echo" command so that test produces output.
mysql-test/t/mysql_client_test.test:
Add "echo" command so that test produces output.
mysql-test/t/mysqltest.test:
Added new test case for "zero size resul file"
Added new test case for "no output"
Make sure all generated sql files are put in var/tmp dir
mysql-test/r/init_file.result:
New BitKeeper file ``mysql-test/r/init_file.result''
mysql-test/r/mysql_client_test.result:
New BitKeeper file ``mysql-test/r/mysql_client_test.result''
in the binlog only
client/client_priv.h:
added OPT_SERVER_ID for --server-id option ot mysqlbinlog
client/mysqlbinlog.cc:
output can be filtered for a certain server-id now
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
client/mysql.cc:
Auto merged
client/mysqladmin.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
client/mysqlshow.c:
Auto merged
isam/isamchk.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisampack.c:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Merged from 4.0.
into krsna.patg.net:/home/patg/mysql-build/mysql-5.1-slap
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
client/client_priv.h:
WORKLOG #2983 - conflict hand-merge
into mysql.com:/home/jimw/my/mysql-5.1-clean
client/mysqldump.c:
Auto merged
mysql-test/r/innodb.result:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/unireg.h:
Auto merged
mysql-test/r/mysqldump.result:
Fix conflict
mysql-test/t/mysqldump.test:
Fix conflict
and modifications to mysql-test-run(.pl/.sh)
client/Makefile.am:
Worklog #2983, added mysqlslap to Makefile.am
client/client_priv.h:
Worklog #2983 Added OPT_CREATE_SLAP_SCHEMA
mysql-test/mysql-test-run.pl:
Worklog #2983 Added mysqlslap test binary to test script
mysql-test/mysql-test-run.sh:
Worklog #2983 Added mysqlslap binary def to test script
client/mysqlslap.c:
Worklog #2983 mysqlslap.c, new utility for running load simulation.
mysql-test/r/mysqlslap.result:
Worklog #2983 Mysqlslap test results
mysql-test/t/mysqlslap.test:
Worklog #2983 Mysqlslap test
into mysql.com:/usr/home/bar/mysql-5.1-new
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
sql/item.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
into mysql.com:/home/jimw/my/mysql-5.0-clean
client/mysql.cc:
Auto merged
client/mysqladmin.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
client/mysqlshow.c:
Auto merged
client/mysqltest.c:
Auto merged
into zim.(none):/home/brian/mysql/mysql-5.1-new
client/mysqldump.c:
Auto merged
mysql-test/r/mysqldump.result:
REsolve
mysql-test/t/mysqldump.test:
Resolve conflict
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 :)
client/client_priv.h:
New option for --replace
client/mysqldump.c:
Added option for REPLACE INTO instead of INSERT INTO
mysql-test/r/mysqldump.result:
Updated REsultes for replace into
mysql-test/t/mysqldump.test:
Added new test for --replace
--hex-blob is used. (Bug #13318)
client/mysqldump.c:
Don't use 0x... syntax for empty fields.
mysql-test/r/mysqldump.result:
Add new results
mysql-test/t/mysqldump.test:
Add new regression test
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/r/sp.result:
merge
sql/share/errmsg.txt:
merge
client/mysqltest.c:
An expected error messages hiding from the log if disable_result_log is in force.
mysql-test/r/sp-dynamic.result:
The test expanded for case of allowed/disalowed recursion.
mysql-test/r/sp-error.result:
Error messages changed.
Test of bug11394() made with allowed recursion.
mysql-test/r/sp.result:
Tests for recursion.
mysql-test/r/trigger.result:
Check that triggers are not affected by this patch.
mysql-test/r/variables.result:
Test of max_sp_recursion_depth variable.
mysql-test/t/sp-dynamic.test:
The test expanded for case of allowed/disalowed recursion.
mysql-test/t/sp-error.test:
Error messages changed.
Test of bug11394() made with allowed recursion.
mysql-test/t/sp.test:
Tests for recursion.
mysql-test/t/trigger.test:
Check that triggers are not affected by this patch.
mysql-test/t/variables.test:
Test of max_sp_recursion_depth variable.
sql/item_func.cc:
sp_find_function() and sp_find_procedure() joined to sp_find_routine()
function as it was mentioned in TODO.
sql/mysqld.cc:
max_sp_recursion_depth variable added.
sql/set_var.cc:
max_sp_recursion_depth variable added.
sql/share/errmsg.txt:
An error message changed.
An error message added.
sql/sp.cc:
sp_find_function() and sp_find_procedure() joined to sp_find_routine()
function as it was mentioned in TODO.
Temory LEX is allocated on a stack, not on a heap.
Recursion support added for stored procedures.
sql/sp.h:
sp_find_function() and sp_find_procedure() joined to sp_find_routine()
function as it was mentioned in TODO.
sql/sp_head.cc:
Initialization of new sp_head fields to get correct list of instances
contained one instance only.
Stack requirement for SP instruction is increased.
Stack free space is checked before mem root initialisation to avoid
memory leak.
Pointer to the free instance management added before and after
SP execution.
sql/sp_head.h:
New sp_head variables added to support inst of instances of SP
for recursion and pointer on ths first free to use instance.
sql/sql_base.cc:
open_table() consume a lot of stack space so we check free stack space before it.
sql/sql_class.h:
max_sp_recursion_depth variable added.
sql/sql_parse.cc:
sp_find_function() and sp_find_procedure() joined to sp_find_routine()
function as it was mentioned in TODO.
