- 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.
mysql-test/r/partition_pruning.result:
WL#2985 "Partition Pruning": post-review fixes: more test cases
mysql-test/t/partition_pruning.test:
WL#2985 "Partition Pruning": post-review fixes: more test cases
sql/opt_range.cc:
WL#2985 "Partition Pruning": post-review fixes:
- Added more comments.
- Fix the debug printouts
- 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).
sql/sql_partition.cc:
WL#2985 "Partition Pruning": post-review fixes: make requested edits in comments.
sql/table.h:
WL#2985 "Partition Pruning": post-review fixes: added bool TABLE::no_partitions_used
(this change was missed when making the original cset)
--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
into mysql.com:/home/dlenev/src/mysql-5.1-merges
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/sql_select.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_show.cc:
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
storage/ndb/tools/ndb_size.pl:
Auto merged
mysql-test/r/information_schema.result:
Manual merge.
mysql-test/t/information_schema.test:
Manual merge.
sql/sql_trigger.cc:
Manual merge.
mysql-test/r/information_schema.result:
Fix for Antony adding plugins to information schema.
sql/ha_archive.cc:
Fix for now using my_off_t, no need to worry about buggy zlib's anymore.
sql/ha_archive.h:
Update to fix issues with buggy zlib.
storage/archive/azio.c:
Moved to using my_off_t (which should fix problems with most fille system size issues).
storage/archive/azlib.h:
Change to using my_off_t
BitKeeper/deleted/.del-rpl_row_view.test~91ced6f754fb06a7:
Delete: mysql-test/t/rpl_row_view.test
BitKeeper/deleted/.del-rpl_row_view.result~7ec7f00e6d6beca9:
Delete: mysql-test/r/rpl_row_view.result
mysql-test/t/rpl_view.test:
Updated to work for both SBR and RBR per lars review comments
mysql-test/r/rpl_view.result:
Updated results file
mysql-test/t/rpl_timezone-master.opt:
Rename: mysql-test/t/rpl_stm_timezone-master.opt -> mysql-test/t/rpl_timezone-master.opt
mysql-test/t/rpl_timezone-slave.opt:
Rename: mysql-test/t/rpl_stm_timezone-slave.opt -> mysql-test/t/rpl_timezone-slave.opt
BitKeeper/deleted/.del-rpl_row_timezone-master.opt~59152d4b828ae88d:
Delete: mysql-test/t/rpl_row_timezone-master.opt
BitKeeper/deleted/.del-rpl_row_timezone-slave.opt~6e899f3565026efd:
Delete: mysql-test/t/rpl_row_timezone-slave.opt
BitKeeper/deleted/.del-rpl_row_timezone.test~eb6bbf4edaa18f2d:
Delete: mysql-test/t/rpl_row_timezone.test
BitKeeper/deleted/.del-rpl_row_timezone.result~ea5c5977bb4da1cf:
Delete: mysql-test/r/rpl_row_timezone.result
mysql-test/r/rpl_timezone.result:
Updated results file
mysql-test/t/rpl_timezone.test:
Remove comment
mysql-test/t/rpl_rewrt_db-slave.opt:
Rename: mysql-test/t/rpl_stm_rewrt_db-slave.opt -> mysql-test/t/rpl_rewrt_db-slave.opt
mysql-test/t/rpl_rewrt_db.test:
Rename: mysql-test/t/rpl_stm_rewrt_db.test -> mysql-test/t/rpl_rewrt_db.test
mysql-test/r/rpl_rewrt_db.result:
Rename: mysql-test/r/rpl_stm_rewrt_db.result -> mysql-test/r/rpl_rewrt_db.result
BitKeeper/deleted/.del-rpl_row_rewrt_db-slave.opt~d63094f08f0f222c:
Delete: mysql-test/t/rpl_row_rewrt_db-slave.opt
BitKeeper/deleted/.del-rpl_row_rewrt_db.test~2aa70363e3b25660:
Delete: mysql-test/t/rpl_row_rewrt_db.test
BitKeeper/deleted/.del-rpl_row_rewrt_db.result~a1f2f21a8d2ed591:
Delete: mysql-test/r/rpl_row_rewrt_db.result
mysql-test/t/rpl_loaddata_m-master.opt:
Rename: mysql-test/t/rpl_stm_loaddata_m-master.opt -> mysql-test/t/rpl_loaddata_m-master.opt
mysql-test/t/rpl_loaddata_m.test:
Updated test to work with both SBR and RBR. RBR show bug. Bug# 15942. Test will be added to disable.def until bug corrected
mysql-test/r/rpl_loaddata_m.result:
new results file for test case
BitKeeper/deleted/.del-rpl_stm_err_ignoredtable.test~bfe9b63deec27fb2:
Delete: mysql-test/t/rpl_stm_err_ignoredtable.test
mysql-test/t/rpl_err_ignoredtable-slave.opt:
Rename: mysql-test/t/rpl_stm_err_ignoredtable-slave.opt -> mysql-test/t/rpl_err_ignoredtable-slave.opt
mysql-test/t/rpl_err_ignoredtable.test:
Updated test to work with both SBR and RBR
mysql-test/r/rpl_err_ignoredtable.result:
Updated results file
mysql-test/t/rpl_user_variables.test:
Works with both SBR and RBR
mysql-test/r/rpl_user_variables.result:
Rename: mysql-test/r/rpl_stm_user_variables.result -> mysql-test/r/rpl_user_variables.result
BitKeeper/deleted/.del-rpl_row_user_variables.result~f7e7536de1d8b8b0:
Delete: mysql-test/r/rpl_row_user_variables.result
BitKeeper/deleted/.del-rpl_stm_user_variables.test~84f68bdef965db77:
Delete: mysql-test/t/rpl_stm_user_variables.test
BitKeeper/deleted/.del-rpl_row_user_variables.test~cca11b4f4d044a26:
Delete: mysql-test/t/rpl_row_user_variables.test
mysql-test/t/rpl_row_log.test:
Updated comment to correct statement
mysql-test/t/disabled.def:
Updated with Bug# 15963
mysql-test/t/rpl_ddl.test:
Updated to work with SBR and RBR
mysql-test/r/rpl_ddl.result:
Updated results
BitKeeper/deleted/.del-rpl_row_ddl.test~d1339fea669fc00a:
Delete: mysql-test/t/rpl_row_ddl.test
BitKeeper/deleted/.del-rpl_row_ddl.result~ce73af252273e6bc:
Delete: mysql-test/r/rpl_row_ddl.result
Problem #1: INSERT...SELECT, Version for 5.1.
Extended the unique table check by a check of lock data.
Merge sub-tables cannot be detected by doing name checks only.
mysql-test/r/create.result:
BUG#5390 - problems with merge tables
Removed a duplicate test.
mysql-test/r/merge.result:
BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT
Added test results.
mysql-test/t/create.test:
BUG#5390 - problems with merge tables
Removed a duplicate test.
mysql-test/t/merge.test:
BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT
Added tests.
sql/lock.cc:
BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT, Version for 5.1.
Added a new function to find a duplicate lock in a list of tables.
sql/mysql_priv.h:
Problem #1: INSERT...SELECT, Version for 5.1.
Added the thread handle to unique_table().
Added a declaration for the new function.
sql/sql_base.cc:
BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT, Version for 5.1.
Added the thread handle to unique_table().
Added a call to the new mysql_lock_have_duplicate(),
which needs the thread handle, to unique_table().
sql/sql_delete.cc:
BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT, Version for 5.1.
Added the thread handle to unique_table().
sql/sql_insert.cc:
BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT, Version for 5.1.
Added the thread handle to unique_table().
sql/sql_load.cc:
BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT, Version for 5.1.
Added the thread handle to unique_table().
sql/sql_parse.cc:
BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT, Version for 5.1.
Added the thread handle to unique_table().
sql/sql_update.cc:
BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT, Version for 5.1.
Added the thread handle to unique_table().
Replaced a call to find_table_in_local_list() by
the newly extended unique_table().
into zim.(none):/home/brian/mysql/cluster-5.1
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/information_schema_db.result:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
1) Fixes breakage in embedded server build for XMLPath push.
2) Hides PARTITION engine from view.
3) Add ENGINES information schema (and it should now be clear from this patch on how to turn any show command into an information schema).
libmysqld/Makefile.am:
Fix for embedded server to build.
mysql-test/r/information_schema.result:
Fix for additional information_schema
mysql-test/r/information_schema_db.result:
Fix for adding additional engines information schema.
mysql-test/t/information_schema.test:
Added test to make sure that engines information schema works.
sql/ha_partition.cc:
Made PARTITION hidden in information schema.
sql/sql_parse.cc:
Added additional case for engine information schema.
sql/sql_show.cc:
Code for ENGINES information schema.
sql/sql_yacc.yy:
Extended grammer to support new ENGINES information schema
sql/table.h:
Comment on dependency in information schema.
libmysqld/item_xmlfunc.cc:
New BitKeeper file ``libmysqld/item_xmlfunc.cc''
into xiphis.org:/home/antony/work3/mysql-5.1-plugable-2
configure.in:
Auto merged
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/bdb.test:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_archive.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/sql_table.cc:
SCCS merged
libmysqld/Makefile.am:
sql/Makefile.am:
Adding new source files.
Adding new file into build process.
include/my_xml.h:
strings/xml.c:
Adding new XML parse flags to skip text normalization and
to use relative tag names. Adding enum for XML token types.
sql/lex.h:
Making parser aware of new SQL functions.
sqll/item_create.h, sql/item_create.cc:
Adding creators for ExtractValue and UpdateXML.
sql/item.h:
Adding new Item types: nodeset and nodeset comparator.
sql/item_xmlfunc.h
sql/item_xmlfunc.cc
Adding new classes implementing XPath functions.
mysql-test/t/xml.test, mysql-test/r/xml.result:
New files: adding test case
include/my_xml.h:
Adding ExtractValue and UpdateXML functions.
Adding XML parser flags and enum for XML token types.
sql/Makefile.am:
Adding new source files.
sql/item.h:
Adding new Item types: nodeset and nodeset comparator.
sql/item_create.cc:
Adding creators for ExtractValue and UpdateXML.
sql/item_create.h:
Adding creators for ExtractValue and UpdateXML.
sql/lex.h:
Make parse aware of new SQL functions.
strings/xml.c:
Adding new flags to skip text normalization and
to use relative tag names.
libmysqld/Makefile.am:
Adding new file into build process.
Problem #1: INSERT...SELECT, Version for 5.0.
Extended the unique table check by a check of lock data.
Merge sub-tables cannot be detected by doing name checks only.
mysql-test/r/create.result:
BUG#5390 - problems with merge tables
Removed a duplicate test.
mysql-test/r/merge.result:
BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT
Added test results.
mysql-test/t/create.test:
BUG#5390 - problems with merge tables
Removed a duplicate test.
mysql-test/t/merge.test:
BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT
Added tests.
sql/lock.cc:
BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT, Version for 5.0.
Added a new function to find a duplicate lock in a list of tables.
sql/mysql_priv.h:
BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT, Version for 5.0.
Added the thread handle to unique_table().
Added a declaration for the new function.
sql/sql_base.cc:
BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT, Version for 5.0.
Added the thread handle to unique_table().
Added a call to the new mysql_lock_have_duplicate(),
which needs the thread handle, to unique_table().
sql/sql_delete.cc:
BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT, Version for 5.0.
Added the thread handle to unique_table().
sql/sql_insert.cc:
BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT, Version for 5.0.
Added the thread handle to unique_table().
sql/sql_load.cc:
BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT, Version for 5.0.
Added the thread handle to unique_table().
sql/sql_parse.cc:
BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT, Version for 5.0.
Added the thread handle to unique_table().
sql/sql_update.cc:
BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT, Version for 5.0.
Added the thread handle to unique_table().
Replaced a call to find_table_in_local_list() by
the newly extended unique_table().
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
set character_octet_length, character_maximum_length for
binary and varbinary field types
mysql-test/r/information_schema.result:
Fix for bug#14271 I_S: columns has no size for (var)binary columns
test case
mysql-test/t/information_schema.test:
Fix for bug#14271 I_S: columns has no size for (var)binary columns
test case
field.cc:
BLOB variations have number-in-bytes limit,
unlike CHAR/VARCHAR which have number-of-characters limits.
A tinyblob column can store up to 255 bytes.
In the case of basic Latin letters (which use 1 byte per character)
we can store up to 255 characters in a tinyblob column.
When passing an utf8 tinyblob column as an argument into
a function (e.g. COALESCE) we need to reserve 3*255 bytes.
I.e. multiply length in bytes to mbcharlen for the character set.
Although in reality a tinyblob column can never be 3*255 bytes long,
we need to set max_length to multiply to make fix_length_and_dec()
of the function-caller (e.g. COALESCE) calculate the correct max_length
for the column being created.
ctype_utf8.result, ctype_utf8.test:
Adding test case.
mysql-test/t/ctype_utf8.test:
Adding test case.
mysql-test/r/ctype_utf8.result:
Adding test case.
sql/field.cc:
Bug#15581: COALESCE function truncates mutli-byte TINYTEXT values
BLOB variations have byte limits,
unlike CHAR/VARCHAR which have number-of-character limits.
It means tinyblob can store up to 255 bytes.
All of them can be basic latin letters which use 1 byte
per character.
I.e. we can store up to 255 characters in a tinyblob column.
When passing a tinyblob column as an argument into
a function (for example COALESCE or CONCAT) we
need to reserve 3*255 bytes in the case of utf-8.
I.e. multiply length in bytes to mbcharlen for the
character set.
Create tmp table filed using original item name when it's necessary
mysql-test/r/view.result:
Fix for bug#14861 aliased column names are not preserved.
test case
mysql-test/t/view.test:
Fix for bug#14861 aliased column names are not preserved.
test case
Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
Bug#15224 SHOW INDEX from temporary table doesn't work.
Restore thd->temporary_tables to be able to process
temporary tables(only for 'show index' & 'show columns').
This should be changed when processing of temporary tables for
I_S tables will be done.
mysql-test/r/information_schema.result:
Bug#12770 DESC cannot display the info. about temporary table
Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
Bug#15224 SHOW INDEX from temporary table doesn't work.
test case
mysql-test/t/information_schema.test:
Bug#12770 DESC cannot display the info. about temporary table
Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
Bug#15224 SHOW INDEX from temporary table doesn't work.
test case
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/r/ndb_multi.result:
Auto merged
mysql-test/r/skip_name_resolve.result:
Auto merged
mysql-test/r/type_time.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
mysql-test/t/ndb_multi.test:
Auto merged
mysql-test/t/skip_name_resolve.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
tests/mysql_client_test.c:
Auto merged
zlib/Makefile.am:
Auto merged
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/r/ndb_multi.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
mysql-test/t/ndb_multi.test:
Auto merged
sql/sql_class.cc:
Auto merged
for uca collation isalnum and strnncollsp don't agree on whether
0xC2A0 is a space (strnncollsp is right, isalnum is wrong).
they still don't, the bug was fixed by avoiding strnncollsp
mysql-test/r/partition_list.result:
test result fixed
mysql-test/r/partition_range.result:
test result fixed
mysql-test/t/partition_list.test:
test fixed
mysql-test/t/partition_range.test:
test fixed
into mysql.com:/home/alexi/dev/mysql-5.0-12440
mysql-test/r/type_time.result:
Auto merged
ndb/src/ndbapi/NdbImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql-common/my_time.c:
Auto merged
zlib/Makefile.am:
Auto merged
long fraction and/or large exponent part".
mysql-test/r/type_time.result:
Fixed testcases results (bug #12440)
mysql-test/t/type_time.test:
Added testcases for bug #12440
sql-common/my_time.c:
Fixed bug #12440: "Incorrect processing of time values containing
long fraction and/or large exponent part".
Modified str_to_time(). Process properly fraction part containing
more than 6 digits. Check for existence of exponent part which
may result from %g formatting applied to time value specified as
large real number.
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
sql/sql_class.cc:
Auto merged
mysql-test/r/ndb_multi.result:
merge
mysql-test/t/ndb_multi.test:
merge
sql/ha_ndbcluster.cc:
merge
- fix EVENT_ACL problem that GRANT ALL on some_db.* to someone@somewhere did not get to mysql.db
- fix crash when the following is executed :
CREATE EVENT P() CREATE EVENT E ON SCHEDULER 1 SECOND DO ROLLBACK;
(creation works as well as calling P() which creates the event).
mysql-test/lib/init_db.sql:
- fix init_db.sql so add Event_priv to the database privs, many tests failed because of that
ommision
- remove the quotes from the column names
mysql-test/t/events.test:
- fix the small test, don't create own db
scripts/mysql_fix_privilege_tables.sql:
- fix that
sql/event.cc:
- be defensive and don't crash if outside has already has opened some table
sql/event_executor.cc:
- show in SHOW PROCESSLIST - "event_scheduler" as name of the user of the main thread
- use "localhost" as the host where event_scheduler comes from
- comment out some debug info, fix other debug info
sql/event_timed.cc:
- enable EVENT creation inside SP. sphead from lex->sphead goes to et->sphead. it's there only
if we compile the event. OTOH when doing
CREATE PROCEDURE PROC() CREATE EVENT SOME_EV ON SCHEDULE EVERY 1 SECOND DO ROLLBACK;
I have only to get the body of the event which is anonymous SP. Before it being "compiled"
but then freed without being used because a bit later it is compiled one more time before
being put in the events cache. So it was good that the memory structures weren't reused but
scrapped out. Now lex->sphead is not needed during event creation but only where the event's
body starts and where it ends so to be able at later stage to compile this anonymous SP (the
body of the event).
sql/sp_head.cc:
- copy over a fix to a crash
sql/sql_acl.h:
- fix privileges.
There was _NO_ documentation about that. Another CHUNK had to be created to so EVENT_ACL gets shifted to
it's place in the db table. So how this is calculated? EVENT_ACL is 1 << 26. Remember 26, see which poistion
in the db table is EVENT_ACL, it's 17, counted from 0. 26 - 17 = 9, then shift it with 9.
CHUNKS are created because in some cases some privileges are in chunks and they are shifted at once. There are
few chunks of such privileges which has to be shifted to get to exactly the structure of mysql.db table.
sql/sql_parse.cc:
- ok, we don't care anymore about lex->sphead because our sphead is lex->et->sphead
sql/sql_yacc.yy:
- bail out if new event_timed returns 0x0
- enable creation of an event inside a SP
CREATE PROCEDURE P() CREATE EVENT E ON SCHEDULE EVERY 1 SECOND DO SELECT 1;
include/my_base.h:
HA_ERR_NO_PARTITION_FOUND added
mysql-test/r/partition_error.result:
test result fixed
mysql-test/t/partition_error.test:
test case added
sql/ha_partition.cc:
now we launch the informative error message here
sql/share/errmsg.txt:
Error message added
mysql-test/r/partition.result:
result fixed
mysql-test/r/partition_mgm_err.result:
result fixed
mysql-test/t/partition.test:
test case added
mysql-test/t/partition_mgm_err.test:
test modified to produce the declared error
sql/handler.h:
check_reorganise_list interface
sql/sql_partition.cc:
check_reorganise_list implementation
sql/sql_table.cc:
now we call check_reorganise_list to do proper test.
Also we should set right no_parts value as it can change here
and bug #15668: Test 'sp-error' crashes server on Mac OS X.
mysql-test/r/rpl000001.result:
Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX
and bug #15668: Test 'sp-error' crashes server on Mac OS X.
- accept 2013 error as well.
mysql-test/t/flush_read_lock_kill.test:
Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX
and bug #15668: Test 'sp-error' crashes server on Mac OS X.
- accept 2013 error as well.
mysql-test/t/rpl000001.test:
Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX
and bug #15668: Test 'sp-error' crashes server on Mac OS X.
- accept 2013 error as well.
mysql-test/t/rpl_error_ignored_table.test:
Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX
and bug #15668: Test 'sp-error' crashes server on Mac OS X.
- accept 2013 error as well.
sql/sql_class.cc:
Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX
and bug #15668: Test 'sp-error' crashes server on Mac OS X.
- don't call the close_active_vio() in case of KILL_QUERY.
into mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss28
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
mysql-test/r/ndb_multi.result:
Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more preditable
mysql-test/t/ndb_multi.test:
Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more preditable
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
mysql-test/r/skip_name_resolve.result:
Auto merged
mysql-test/t/skip_name_resolve.test:
Auto merged
sql/sp_head.cc:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
ndb/src/kernel/vm/SimulatedBlock.cpp:
merge