into mysql.com:/home/bar/mysql-5.1-new-rpl
client/mysql.cc:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/mysqld.cc:
SCCS merged
Problem: setting/displaying @@LC_TIME_NAMES didn't distinguish between
GLOBAL and SESSION variable types - always SESSION variable
was set/shonw.
Fix: set either global or session value.
Also, "mysqld --lc-time-names" was added to set "global default" value.
mysql-test/r/variables.result:
Adding test cases
mysql-test/t/variables.test:
Adding test cases
sql/mysql_priv.h:
Declaring variable for global default.
sql/mysqld.cc:
Adding --lc-time-names
sql/set_var.cc:
Distinguish between GLOBAL and SESSION variables.
sql/sql_class.cc:
Don't initialize to en_US, use global_system_variables value instead.
Problem: output was empty if the result is empty.
Fix: print XML header and footer, even if the result
is empty, to produce well-formed XML output.
client/mysql.cc:
Print header and footer even on empty set, when --xml
mysql-test/r/client_xml.result:
Adding test case
mysql-test/t/client_xml.test:
Adding test case
mysql-test/r/events_trans.result:
result fixed
mysql-test/r/windows.result:
merging fix
mysql-test/t/events_trans.test:
moved to events_trans_notembedded.test
mysql-test/r/events_trans_notembedded.result:
New BitKeeper file ``mysql-test/r/events_trans_notembedded.result''
mysql-test/t/events_trans_notembedded.test:
New BitKeeper file ``mysql-test/t/events_trans_notembedded.test''
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
client/mysqldump.c:
Auto merged
mysql-test/r/rpl_packet.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/rpl_packet.test:
Auto merged
sql/field.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
mysql-test/r/create.result:
SCCS merged
mysql-test/t/create.test:
merging
mysql-test/t/disabled.def:
merging
sql/events.cc:
merging
sql/sql_parse.cc:
SCCS merged
NO_AUTO_VALUE_ON_ZERO mode.
The table->auto_increment_field_not_null variable wasn't reset after
reading a row which may lead to inserting a wrong value to the auto-increment
field to the following row.
The table->auto_increment_field_not_null variable is reset now right after a
row is being written in the read_fixed_length() and the read_sep_field()
functions.
Removed wrong setting of the table->auto_increment_field_not_null variable in
the read_sep_field() function.
mysql-test/t/loaddata.test:
Added a test case for the bug#27586: Wrong autoinc value assigned by LOAD DATA in the
NO_AUTO_VALUE_ON_ZERO mode.
mysql-test/r/loaddata.result:
Added a test case for the bug#27586: Wrong autoinc value assigned by LOAD DATA in the
NO_AUTO_VALUE_ON_ZERO mode.
sql/sql_load.cc:
Bug#27586: Wrong autoinc value assigned by LOAD DATA in the
NO_AUTO_VALUE_ON_ZERO mode.
The table->auto_increment_field_not_null variable is reset now right after a
row is being written in the read_fixed_length() and the read_sep_field()
functions.
Remove wrong setting of the table->auto_increment_field_not_null variable in
the read_sep_field() function.
This will hopefully fix events.test failure on vmware-win32,
where scheduling is very primitive.
mysql-test/t/events_scheduling.test:
This test case has no races now and can be enabled under valgrind.
sql/event_scheduler.cc:
Make Event Scheduler thread shutdown more synchronous: report
successful shutdown only after having removed the scheduler
thread from the global list of threads.
This ensures that after the scheduler has been stopped, its
thread is not present in SHOW PROCESSLIST output.
update rpl_ndb_innodb2ndb and rpl_ndb_myisam2ndb testcase's option and result
mysql-test/t/disabled.def:
recover test case 'rpl_ndb_innodb2ndb' and 'rpl_ndb_myisam2ndb'
mysql-test/t/rpl_ndb_innodb2ndb-slave.opt:
add "--new=ture" option to mysqld, that means "Use very new possible 'unsafe' functions"
mysql-test/t/rpl_ndb_myisam2ndb-slave.opt:
add "--new=ture" option to mysqld, that means "Use very new possible 'unsafe' functions"
mysql-test/r/rpl_ndb_innodb2ndb.result:
get the test result by 'mysql-test-run.pl --record rpl_ndb_innodb2ndb'
mysql-test/r/rpl_ndb_myisam2ndb.result:
get the test result by 'mysql-test-run.pl --record rpl_ndb_myisam2ndb'
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
mysql-test/r/order_by.result:
Auto merged
mysql-test/r/type_set.result:
Auto merged
mysql-test/t/order_by.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Fixed test for row based replication
mysql-test/mysql-test-run.pl:
After merge fix
mysql-test/r/maria.result:
Fixed test for row based replication
mysql-test/t/maria.test:
Fixed test for row based replication
storage/maria/ha_maria.cc:
After merge fix
storage/maria/ma_blockrec.c:
Better to clear whole page, as 'length' may be bigger than what we need.
storage/maria/ma_loghandler.c:
Fix compiler warning
Removed access to not initialized memory
storage/maria/ma_open.c:
Remove wrong (not needed) test
Apparently it's the only platform in pushbuild where we
compile without openssl.
mysql-test/r/information_schema.result:
Update results.
mysql-test/r/openssl_1.result:
Update results.
mysql-test/t/information_schema.test:
Move the part of the test case that needs SSL support to
openssl_1.test
mysql-test/t/openssl_1.test:
Add a test case that needs SSL support.
- Giving the directive '--all-databases' to mysqldump caused
an attempt to lock and dump log tables which don't support this
operation.
- With this patch the log tables are excluded from the set of
databases tables to dump.
client/mysqldump.c:
- Ignore log tables which can't be locked.
mysql-test/t/mysqldump.test:
Added test
mysql-test/r/grant.result:
Fixed a result. Editor added wrong characters.
mysql-test/r/mysqlbinlog2.result:
Fixed
mysql-test/r/sp.result:
Fixed a result, moved lines around.
mysql-test/r/sp_trans.result:
Fixed a result, moved lines around.
mysql-test/t/mysqlbinlog2.test:
Merged tests from 5.0
mysql-test/t/sp_trans.test:
Merged test from 5.0 and fixed to be compatible with 5.1
sql/sql_class.cc:
Merged from 5.0
sql/sql_error.cc:
Fixed push_warning()
into vajra.(none):/opt/local/work/mysql-5.1-c1
sql/mysqld.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
Bug#23631 "Events: SHOW VARIABLES doesn't work when mysql.event
is damaged:
mysql-test/r/events.result:
Update results (a post-merge fix)
mysql-test/r/events_bugs.result:
Update results (a post-merge fix)
mysql-test/r/events_scheduling.result:
Update results (a post-merge fix)
mysql-test/t/events_scheduling.test:
Make sure this test has no races.
sql/event_data_objects.cc:
Manual post-merge fix for the events replication patch.
sql/event_data_objects.h:
A post-merge fix.
sql/event_db_repository.cc:
A post-merge fix.
sql/event_scheduler.cc:
We should drop the event inside ::execute since there we have
the right credentials to do so (otherwise Events::drop_event
returns "access denied" error).
sql/events.cc:
A post-review fix for: rename start_or_stop_event_scheduler
to switch_event_scheduler_state.
sql/events.h:
A post-review fix for: rename start_or_stop_event_scheduler
to switch_event_scheduler_state.
sql/set_var.cc:
A post-review fix for: rename start_or_stop_event_scheduler
to switch_event_scheduler_state.
sql/sql_yacc.yy:
Remove unused declaratoins.
mysql-test/suite/funcs_1/r/a_version_check.result:
new version
mysql-test/suite/partitions/include/partition_supported_sql_funcs.inc:
read data from file.
mysql-test/suite/partitions/include/partition_supported_sql_funcs_delete.inc:
read data from file.
mysql-test/suite/partitions/include/partition_supported_sql_funcs_main.inc:
read data from file.
mysql-test/suite/partitions/r/partition_supported_sql_func_innodb.result:
read data from file.
mysql-test/suite/partitions/r/partition_supported_sql_func_myisam.result:
read data from file.
mysql-test/suite/partitions/t/disabled.def:
added not executable test program.
mysql-test/suite/partitions/t/partition_supported_sql_func_innodb.test:
switched to long test.
mysql-test/suite/partitions/t/partition_supported_sql_func_myisam.test:
switched to long test
BitKeeper/etc/ignore:
Added mysql-test/suite/partitions/t/partition.test mysql-test/suite/partitions/r/dif mysql-test/suite/partitions/r/partition.result mysql-test/suite/partitions/r/partition_t55.out mysql-test/suite/partitions/r/partition_t55.refout to the ignore list
mysql-test/suite/partitions/r/partition_supported_sql_func_ndb.result:
new result file.
mysql-test/suite/partitions/t/partition_supported_sql_func_ndb.test:
ndb wrapper.
mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_ch1.in:
inpu file.
mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_date.in:
input file
mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_float.in:
input file
mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_int.in:
input file
mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_time.in:
input file
mysql-test/suite/partitions/r/partition_t55.out:
reference fiel for output data to compare
As we have unified paths inside partition engine, we should look for '/'
as a path separator
mysql-test/r/windows.result:
result fixed
mysql-test/t/windows.test:
testcase
sql/ha_partition.cc:
check for '/' instead of FN_LIBCHAR
