- error string wrongly formatted
mysql-test/r/ndb_partition_error.result:
Bug #17763 mysqld cores with list partitioning if update to missing partition
mysql-test/t/ndb_partition_error.test:
Bug #17763 mysqld cores with list partitioning if update to missing partition
mysql-test/r/events.result:
Auto merged
mysql-test/t/events.test:
Auto merged
sql/event.cc:
Auto merged
sql/event.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
- now when the event is created and STARTS is omitted then STARTS is implicitly
CURRENT_TIMESTAMP
- This CS also fixed incorrect presentation of STARTS/ENDS in I_S.EVENTS
(incorporated review changes)
mysql-test/r/events.result:
results of new test cases
mysql-test/t/events.test:
new test cases for bug #16537 (Events: mysql.event.starts is null)
sql/event.cc:
- check whether event_timed::starts_null only in case
event_timed::expression is set, so for recurring events only
- disable binlogging of CREATE EVENT statement. It should not be
replicated but the result of the execution. Still the replication is
untouched topic.
sql/event.h:
- add flags whether starts, ends and execute_at are null or not
sql/event_executor.cc:
- check whether xxx_null instead of !xxxx.year
sql/event_timed.cc:
- introduce xxx_null and change the usage of xxx.year to !xxx_null
sql/sql_show.cc:
- don't show 0000-00-00 in I_S.EVENTS when the value is NULL
sql/sql_yacc.yy:
- if STARTS is omitted default to current_timestamp
xml.result, xml.test:
Adding test case.
item_xmlfunc.cc:
Fixed that the "!" character written at the end was ignored.
Now if we try to scan "!=", and if "!" is not
followed by "=", we rollback lex scanner back
to "!" token, so the parser will start to check
the next rule from the "!" character again.
Previously parser started from the next character,
which was EOF in the example in xml.test,
which led to query being successfully parsed,
instead of producing a syntax error.
sql/item_xmlfunc.cc:
Bug#16313 XML: extractvalue() ignores '!' in names
'!' at the end was ignored.
Now if we try to scan "!=", and if "!" is not
followed by "=", we rollback lex scanner back
to "!" token, so the parser will start to check
the next rule from the "!" character again.
Previously it started from the next character,
which was EOF in the example in xml.test, and
which led to query being successfully parsed,
instead of producing a syntax error.
mysql-test/t/xml.test:
Adding test case.
mysql-test/r/xml.result:
Adding test case.
The table may be corrupted and decimal columns may have invalid values in this case.
To prevent crash we need to check that decimal column has allowable value.
In case of invalid value generate warning and set the value to 0.
mysql-test/extra/binlog_tests/insert_select-binlog.test:
Fixing isssues with preexisting tables
mysql-test/r/binlog_stm_insert_select.result:
new results
bug #13525 "Rename table does not keep info of triggers".
Now we use MYSQLTEST_VARDIR in order to be able to run this test in different
vardir. Also improved cleanup after the test.
mysql-test/t/trigger.test:
Now we use MYSQLTEST_VARDIR in order to be able to run this test in different
vardir. Also improved cleanup after the test.
into mysql.com:/home/dlenev/src/mysql-5.1-merges2
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
storage/myisammrg/myrg_queue.c:
Auto merged
sql/sql_rename.cc:
Manual merge.
sql/sql_trigger.cc:
Manual merge.
sql/sql_yacc.yy:
Manual merge.
into mysql.com:/home/dlenev/src/mysql-5.0-bg13525
sql/field.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_select.h:
Manual merge.
- Use 'poll' if available
- Check that sd <= FD_SETSIZE if using 'select'
- Handle case when 'net_data_is_ready' returns -1, ie. sd > FD_SETSIZE and 'select' is used
sql/net_serv.cc:
Use 'poll' in favor of 'select' if avaliable
This is to avoid the limitation with 'select' only being able to handle fd's with numbers <= 1024 as default.
If 'poll' is not available use 'select' but check that we are not having a number higher than FD_SETSIZE
Handle the case when 'net_data_is_ready' can't check if there is data to read, since the sd number is too high
- Use binary charset in acl_cache, to make searches case sensitive
- Add testcase
mysql-test/r/grant2.result:
Update test result
mysql-test/t/grant2.test:
Add test case for bug#17279, checking that user with access to TESTDB can't create TEStdb
sql/sql_acl.cc:
Use binary charset for the acl_cache to make the hash lookups case sensitive.
Thus denying user with access to "TESTDB" access to "TEStdb"
mysql-test/t/rpl_ndb_2innodb.test:
New rpl ndb test case for replicating to other storage engines
mysql-test/t/rpl_ndb_2myisam.test:
New rpl ndb test case for replicating to other storage engines
mysql-test/t/rpl_ndb_2innodb-slave.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_2innodb-master.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_2myisam-master.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_2myisam-slave.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_innodb2ndb.test:
New rpl ndb test case for replicating from other storage engines to ndb
mysql-test/t/rpl_ndb_myisam2ndb.test:
New rpl ndb test case for replicating from other storage engines to ndb
mysql-test/t/rpl_ndb_innodb2ndb-master.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_innodb2ndb-slave.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_myisam2ndb-master.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_myisam2ndb-slave.opt:
New rpl ndb test supporting option files
mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test:
New test code that drives the rpl of ndb -> innodb/myisam or innodb/myisam -> ndb
mysql-test/include/rpl_multi_engine3.inc:
New include that cover repeating code of the rpl of ndb -> innodb/myisam or innodb/myisam -> ndb
mysql-test/t/disabled.def:
Updated to include new test cases that have outstanding bug reports.
VC++Files/mysql.sln:
gen_lex_hash.vcproj is added into mysql.sln for win32 build.
VC++Files/sql/gen_lex_hash.dsp:
gen_lex_hash project file is added for win32 build.
VC++Files/sql/gen_lex_hash.vcproj:
gen_lex_hash project file is added for win32 build.
--skip-grant-tables. However when deleting functions UDFs list was checked
regardless of whther UDFs are initialized or not. Additional check is added
into free_udf() and find_udf() functions to prevent possible runtime errors.
mysql-test/r/skip_grants.result:
Test result for #17595 patch.
mysql-test/t/skip_grants.test:
Test for #17595 patch.
- Removed ifdefs from handler class
- The handler class is an external interface to dynamically loadable storage engine and should not be changed by defines. This is especially important for the virtual functions.
sql/handler.h:
Remove the ifdef's for WITH_PARTITION_STORAG_ENGINE from handler class.
- Change && to ||
- Check for return value != 0 in "ndb->init()"
mysql-test/r/ndb_cache_multi2.result:
Update test result
mysql-test/t/ndb_cache_multi2.test:
Update test case
- add printouts for what server the queries are from
- Run the query from "while" once on server1 to cache it
sql/ha_ndbcluster.cc:
&& => ||, to call both the function "thd->store_global()" and "ndb->init()"
ndb_init returns 0 on sucess. Fail if not zero.
- Set FD_SETSIZE before including "sys/select.h"
include/my_global.h:
Define FD_SETSIZE on QNX before including "sys/select.h" or "sys/time.h". This defines number of bits in fd_set type used for 'select'
xml.result:
Adding test for Bug #16312 XML: extractvalue() crash if angle brackets,
A fix for #16234 fixed this bug automatically.
mysql-test/t/xml.test:
Adding test for Bug #16312 XML: extractvalue() crash if angle brackets,
A fix for #16234 fixed this bug automatically.
Bug#17721, hang in exampledb, solved by msvensson
drop-on-restart.inc:
Added drop of tables t00,t03,t04
mysql-test/include/drop-on-restart.inc:
Added drop of tables t00,t03,t04
VC++Files/storage/example/example.vcproj:
Bug#17721, hang in exampledb, solved by msvensson
