into magare.gmz:/home/kgeorge/mysql/work/B36011-5.1-bugteam
sql/sql_select.cc:
Auto merged
mysql-test/r/subselect.result:
merge of bug 36011 to 5.1-bugteam
mysql-test/t/subselect.test:
merge of bug 36011 to 5.1-bugteam
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570
mysql-test/suite/rpl/t/rpl_sp.test:
Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
Use local. Needs re-recording.
mysql-test/r/ctype_cp932_binlog_stm.result:
New offsets because of quote marks.
mysql-test/r/mysqlbinlog.result:
Re-add variables removed in merge at file-vers 1.47.
mysql-test/suite/binlog/r/binlog_database.result:
create_string() output changes the quoting and inserts newlines.
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
Change in quoting.
mysql-test/suite/rpl/r/rpl_sp.result:
Adds quotes and newlines in creation of routines in binlog.
mysql-test/extra/rpl_tests/rpl_insert_id.test:
Moving save and restore of @@global.concurrent_insert into the same
session thread.
mysql-test/suite/rpl/r/rpl_insert_id.result:
Result file change.
mysql-test/suite/rpl/t/rpl_insert_id.test:
***MISSING TEXT***
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570
mysql-test/suite/rpl/t/rpl_sp.test:
Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
manual merge.
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570
BitKeeper/deleted/.del-binlog_innodb.result:
Auto merged
sql/sp_head.cc:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
need to re-record.
mysql-test/suite/rpl/r/rpl_sp.result:
need to re-record.
mysql-test/r/mysqlbinlog.result:
manual merge.
mysql-test/suite/rpl/t/rpl_sp.test:
manual merge.
sql/sp.cc:
manual merge.
sql/sp_head.h:
manual merge.
Problem: If INSERT is immediately followed by SELECT in another thread,
the newly inserted rows may not be returned by the SELECT statement, if
ENGINE=myisam and @@concurrent_insert=1. This caused sporadic errors in
rpl_insert_id.
Fix: The test now uses ENGINE=$engine_type when creating tables (so that
innodb is used). It also turns off @@concurrent_insert around the critical
place, so that it works if someone in the future writes a test that sets
$engine_type=myisam before sourcing extra/rpl_tests/rpl_insert_id.test.
It also adds ORDER BY to all SELECTs so that the result is deterministic.
mysql-test/extra/rpl_tests/rpl_insert_id.test:
- Use ENGINE=$engine_type when creating tables, since that's expected by
suite/rpl/t/rpl_insert_id.test.
- Use ORDER BY to avoid nondeterministic results from SELECT.
- Set @@concurrent_insert=0 before doing SELECT after INSERT in another
client.
mysql-test/suite/rpl/r/rpl_insert_id.result:
Update result file.
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570
BitKeeper/deleted/.del-binlog_innodb.result:
Auto merged
mysql-test/r/mysqlbinlog.result:
need to record.
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
need to record.
mysql-test/suite/rpl/r/rpl_sp.result:
need to record.
mysql-test/suite/rpl/t/rpl_sp.test:
manual merge.
sql/sp.cc:
Manual merge
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_views.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
Auto merged
mysql-test/suite/funcs_1/r/myisam_views.result:
merge of 5.1 to 5.1-bugteam
into mysql.com:/home/kent/bk/mysql-5.1
BUILD/Makefile.am:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/std_data/funcs_1/innodb_tb1.txt:
Auto merged
mysql-test/std_data/funcs_1/innodb_tb2.txt:
Auto merged
mysql-test/std_data/funcs_1/innodb_tb3.txt:
Auto merged
mysql-test/std_data/funcs_1/innodb_tb4.txt:
Auto merged
mysql-test/std_data/funcs_1/memory_tb1.txt:
Auto merged
mysql-test/std_data/funcs_1/memory_tb2.txt:
Auto merged
mysql-test/std_data/funcs_1/memory_tb3.txt:
Auto merged
mysql-test/std_data/funcs_1/memory_tb4.txt:
Auto merged
mysql-test/std_data/funcs_1/myisam_tb1.txt:
Auto merged
mysql-test/std_data/funcs_1/myisam_tb2.txt:
Auto merged
mysql-test/std_data/funcs_1/myisam_tb3.txt:
Auto merged
mysql-test/std_data/funcs_1/myisam_tb4.txt:
Auto merged
mysql-test/std_data/funcs_1/t3.txt:
Auto merged
mysql-test/std_data/funcs_1/t4.txt:
Auto merged
mysql-test/std_data/funcs_1/t7.txt:
Auto merged
mysql-test/std_data/funcs_1/t9.txt:
Auto merged
mysql-test/suite/funcs_1/README.txt:
Auto merged
mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
Auto merged
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
Auto merged
mysql-test/suite/funcs_1/include/innodb_tb1.inc:
Auto merged
mysql-test/suite/funcs_1/include/innodb_tb2.inc:
Auto merged
mysql-test/suite/funcs_1/include/innodb_tb3.inc:
Auto merged
mysql-test/suite/funcs_1/include/innodb_tb4.inc:
Auto merged
mysql-test/suite/funcs_1/include/memory_tb1.inc:
Auto merged
mysql-test/suite/funcs_1/include/memory_tb2.inc:
Auto merged
mysql-test/suite/funcs_1/include/memory_tb3.inc:
Auto merged
mysql-test/suite/funcs_1/include/memory_tb4.inc:
Auto merged
mysql-test/suite/funcs_1/include/myisam_tb1.inc:
Auto merged
mysql-test/suite/funcs_1/include/myisam_tb2.inc:
Auto merged
mysql-test/suite/funcs_1/include/myisam_tb3.inc:
Auto merged
mysql-test/suite/funcs_1/include/myisam_tb4.inc:
Auto merged
mysql-test/suite/funcs_1/include/sp_tb.inc:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_views.result:
Auto merged
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
Auto merged
mysql-test/suite/funcs_1/r/is_columns_memory.result:
Auto merged
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
Auto merged
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_03.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_08.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_09.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
Auto merged
mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
Auto merged
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
Auto merged
mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
Auto merged
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
Auto merged
mysql-test/suite/funcs_1/triggers/triggers_03.inc:
Auto merged
mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
Auto merged
mysql-test/suite/funcs_1/triggers/triggers_08.inc:
Auto merged
mysql-test/suite/funcs_1/triggers/triggers_09.inc:
Auto merged
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
Auto merged
mysql-test/suite/funcs_1/views/func_view.inc:
Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
Auto merged
When flushing tables, there were a slight chance that the flush was occuring
between processing of two table map events. Since the tables are opened
one by one, it might result in that the tables were not valid and that sub-
sequent locking of tables would cause the slave to crash.
The problem is solved by opening and locking all tables at once using
simple_open_n_lock_tables(). Also, the patch contain a change to open_tables()
so that pre-locking only takes place when the trg_event_map is not zero, which
was not the case before (this caused the lock to be placed in thd->locked_tables
instead of thd->lock since the assumption was that triggers would be called
later and therefore the tables should be pre-locked).
mysql-test/suite/rpl/r/rpl_found_rows.result:
Result change
mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result:
Result change
mysql-test/suite/rpl/t/rpl_found_rows.test:
Adding drop of table that was created in test.
mysql-test/suite/rpl/t/rpl_slave_status.test:
Adding waits for slave start and stop to ensure that test works.
sql/log_event.cc:
Replacing table-by-table open and lock with a single call
to simple_open_n_lock_tables(), which in turn required some
changes to other code.
sql/log_event_old.cc:
Replacing table-by-table open and lock with a single call
to simple_open_n_lock_tables(), which in turn required some
changes to other code.
sql/sql_base.cc:
Extending check inside open_tables() so that pre-locking in only done if
tables->trg_egent_map is non-zero.
mysql-test/include/wait_for_slave_sql_to_start.inc:
New BitKeeper file ``mysql-test/include/wait_for_slave_sql_to_start.inc''
test change for 5.1+ (show create view adds two columns in 5.1)
Patch only for 5.1+
mysql-test/suite/rpl/r/rpl_sp.result:
restored the original 5.1 test result
mysql-test/suite/rpl/r/rpl_view.result:
Bug#32575: Parse error of stmt with extended comments on slave side
Updated test result for show create view in 5.0 to 5.1
into client-10-129-10-147.upp.off.mysql.com:/Users/mattiasj/clones/topush-51-bugteam
mysql-test/suite/rpl/r/rpl_sp.result:
Auto merged
mysql-test/suite/rpl/t/rpl_view.test:
Auto merged
sql/sql_view.cc:
This was already fixed in 5.1
mysql-test/suite/rpl/r/rpl_view.result:
manual merge
Temporarily checking in an incorrect test case. Rationale: the impact of
this bug is negligible (it's almost a feature request). We need 5.1 to be
stable, and making a real fix is a bit risky. So the fix is postponed
to 6.0.
mysql-test/suite/rpl/r/rpl_ddl.result:
Updated result file.
mysql-test/suite/rpl/t/disabled.def:
Enabling test case rpl_ddl.test
The test suite/rpl/t/rpl_innodb_bug28430.test was disabled because of
BUG#32247, but not re-enabled when BUG#32247 was fixed. I've re-enabled
it. The test and result file needed to be updated too.
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
Updated result file.
mysql-test/suite/rpl/t/disabled.def:
Enabled the rpl_innodb_bug28430 test case.
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
show slave status is not needed since we have select count(*)
The problem is that the patch for Bug 33464 didn't update the
results of the test cases which caused the problem.
Dropping a stored routine also revoke privileges for all users
on the stored routine and errors about missing grants are converted
into warnings. Before Bug 33464 such errors could be incorrectly
returned to the user, which would later trigger a assertion due to
multiple errors being set.
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
Update test case result, grants were already dropped.
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
Update test case result, grants were already dropped.
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
Update test case result, grants were already dropped.
mysql-test/suite/funcs_1/r/ndb_storedproc_06.result:
Update test case result, grants were already dropped.
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
Add comment regarding bug revealed by test case.
mysql-test/suite/funcs_1/t/disabled.def:
Re-enable test cases, bug has been fixed.
Bug#31237 Test "ndb_views" fails because of differing order of select results
mysql-test/suite/funcs_1/r/innodb_views.result:
Updated results
mysql-test/suite/funcs_1/r/memory_views.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
Updated results
mysql-test/suite/funcs_1/r/ndb_views.result:
Updated results
mysql-test/suite/funcs_1/views/views_master.inc:
Mangle the row numbers
Select of the test could not perform deterministically, because the table remains to be
updatable by the running event handler.
Fixed with changing verification to use a logical values instead of comparison
with a pre-recorded results.
mysql-test/include/rpl_events.inc:
changing verification to use a logical values instead of comparison with a pre-recorded
results
mysql-test/suite/rpl/r/rpl_events.result:
resutls updated.
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/suite/funcs_1/datadict/processlist_val.inc:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/suite/rpl/t/disabled.def:
SCCS merged
into ramayana.hindu.god:/home/tsmith/m/bk/bugteam/mrg/51
mysql-test/suite/rpl/r/rpl_packet.result:
Auto merged
mysql-test/suite/rpl/t/rpl_packet.test:
Auto merged
mysql-test/suite/rpl/t/disabled.def:
SCCS merged
Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows
Bug#36034 - Test parts.part_supported_sql_func_<eng> fails on Windows
Bug#36036 - Test parts.partition_alter1_<eng> fails on Windows
Bug#36037 - Test parts.partition_alter2_<eng> fails on Windows
Bug#36038 - Test parts.partition_basic_<engine> failing on Windows
Bug#36039 - Test parts.partition_engine_<eng> fails on Windows
Bug#36040 - Test parts.partition_syntax_<eng> fails on Windows
Changeset to fix multiple 5.1.24-rc build bugs on Windows platforms.
Many of these bugs had the same root causes.
mysql-test/mysql-test-run.pl:
Bug#36034 - Test parts.partition_supported_sql_func_<eng> fails on Windows
Kent suggested these changes to ensure all contents of mysql-test/std_data are copied to std_data_ln on Windows (no symlinks)
mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows
Altered .inc file to include HOST column in the --replace_column clauses.
Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
mysql-test/suite/funcs_1/datadict/processlist_val.inc:
Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows
Altered .inc file to include HOST column in the --replace_column clauses.
Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result:
Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows
Altered .inc file to include HOST column in the --replace_column clauses.
Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
-reran .result file to account for change in --replace_column calls
mysql-test/suite/funcs_1/r/processlist_priv_ps.result:
Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows
Altered .inc file to include HOST column in the --replace_column clauses.
Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
-reran .result file to account for change in --replace_column calls
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result:
Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows
Altered .inc file to include HOST column in the --replace_column clauses.
Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
Reran .result file to account for changes to --replace_column clauses
mysql-test/suite/funcs_1/r/processlist_val_ps.result:
Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows
Altered .inc file to include HOST column in the --replace_column clauses.
Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
Reran .result file to account for changes to --replace_column clauses
mysql-test/suite/parts/inc/partition_layout_check1.inc:
Bug#36036 - Test parts.partition_alter1_<eng> fails on Windows
Bug#36037 - Test parts.partition_alter2_<eng> fails on Windows
Bug#36038 - Test parts.partition_basic_<engine> failing on Windows
Bug#36039 - Test parts.partition_engine_<eng> fails on Windows
Bug#36040 - Test parts.partition_syntax_<eng> fails on Windows
Added replace_result clause to account for Windows' use of '\r' vs. '\n'
This difference was causing failures on Windows.
Also, mleich added some changes to remove some -ls clauses that weren't necessary
mysql-test/suite/parts/inc/partition_layout_check2.inc:
Bug#36036 - Test parts.partition_alter1_<eng> fails on Windows
Bug#36037 - Test parts.partition_alter2_<eng> fails on Windows
Bug#36038 - Test parts.partition_basic_<engine> failing on Windows
Bug#36039 - Test parts.partition_engine_<eng> fails on Windows
Bug#36040 - Test parts.partition_syntax_<eng> fails on Windows
Added replace_result clause to account for Windows' use of '\r' vs. '\n'
This difference was causing failures on Windows.
Also, mleich added some changes to remove some -ls clauses that weren't necessary
mysql-test/suite/parts/r/partition_basic_symlink_myisam.result:
changes by mleich to remove unneeded use of -ls clause in .result file
These clauses were removed from partition_layout_check1.inc and partition_layout_check2.inc
Among two claimed artifacts the critical one is in that the Table map of
a query following the failing with a duplicate key error CREATE-SELECT is skipped from
instantionating (and thus binlogging). That leads to sending a "chopped" group of the data
row-events without the table map head to the slave.
The slave can not apply the only data row events.
It's not easy to force the slave to react with an error in such a case (the second complaint
on the bug report), because the lack of a table Rows_log_event::do_apply_event the data row event
handler is a common situation which normally designates the event has to be filtered out
basing on the repliation do/ingore rules decision.
Fixed: table map creating and binlogging is restored via deploying the standard cleanup call in
select_create::abort().
No error is reported if by chance the table map was not been binlogged.
Leaving this out to resolve with considering how to combine the do/ingore rules with the situation
when erronoulsy the Table_map is not written to binlog.
mysql-test/suite/rpl/r/rpl_row_create_table.result:
results changed
mysql-test/suite/rpl/t/rpl_row_create_table.test:
regression test for the bug
sql/sql_insert.cc:
adding resetting of thd binlogging state that was missed for the particular case of failing CREATE..SELECT
into trift2.:/MySQL/M51/tmp-5.1
Null merge - changes specific to 5.1.24-rc are superseded by better ones done in parallel.
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
Null merge.
mysql-test/suite/funcs_1/r/innodb_trig_03e.result:
Null merge.
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
Null merge.
mysql-test/suite/funcs_1/r/memory_trig_03e.result:
Null merge.
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
Null merge.
mysql-test/suite/funcs_1/r/myisam_trig_03e.result:
Null merge.
mysql-test/suite/funcs_1/r/ndb_storedproc_02.result:
Null merge.
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
Null merge.
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
Null merge.
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc:
Null merge.
mysql-test/suite/funcs_1/r/innodb_storedproc.result:
Null merge - changes specific to 5.1.24-rc are superseded by better ones done in parallel.
mysql-test/suite/funcs_1/r/memory_storedproc.result:
Null merge - changes specific to 5.1.24-rc are superseded by better ones done in parallel.
mysql-test/suite/funcs_1/r/myisam_storedproc.result:
Null merge - changes specific to 5.1.24-rc are superseded by better ones done in parallel.
mysql-test/suite/funcs_1/r/ndb_storedproc.result:
Null merge - changes specific to 5.1.24-rc are superseded by better ones done in parallel.
Problems were caused by modifications of
- the server
- HANDLER FOR SQLSTATE '00000' is now rejected (bug fix)
affects several ..._storedproc* tests
- improved error message
affects the ..._trig_03e
- improved content of information_schema.COLUMNS about
information_schema.REFERENTIAL_CONSTRAINTS
affects is_columns_is
- the content of the community build (collations)
affects charset_collation_3
mysql-test/suite/funcs_1/r/charset_collation_3.result:
Updated result
mysql-test/suite/funcs_1/r/innodb_storedproc.result:
Updated result
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
Updated result
mysql-test/suite/funcs_1/r/innodb_trig_03e.result:
Updated result
mysql-test/suite/funcs_1/r/is_columns_is.result:
Updated result
mysql-test/suite/funcs_1/r/memory_storedproc.result:
Updated result
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
Updated result
mysql-test/suite/funcs_1/r/memory_trig_03e.result:
Updated result
mysql-test/suite/funcs_1/r/myisam_storedproc.result:
Updated result
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
Updated result
mysql-test/suite/funcs_1/r/myisam_trig_03e.result:
Updated result
mysql-test/suite/funcs_1/r/ndb_storedproc.result:
Updated result
mysql-test/suite/funcs_1/r/ndb_storedproc_02.result:
Updated result
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
Updated result
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
Corrected script
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc:
Corrected script
mysql-test/include/master-slave-reset.inc:
Adding missing waits for slave to start and stop causing test failures.
mysql-test/suite/rpl/t/rpl_insert.test:
Waiting for the rows to be inserted instead of relying on the binlog position
to be updated correctly.
into five.local.lan:/work/merge/mysql-5.1-Bug
Addditional manual fixes will be needed.
BitKeeper/deleted/.del-triggers_master.test:
Auto merged
mysql-test/std_data/funcs_1/innodb_tb1.txt:
Auto merged
mysql-test/std_data/funcs_1/innodb_tb2.txt:
Auto merged
mysql-test/std_data/funcs_1/innodb_tb3.txt:
Auto merged
mysql-test/std_data/funcs_1/innodb_tb4.txt:
Auto merged
mysql-test/std_data/funcs_1/memory_tb1.txt:
Auto merged
mysql-test/std_data/funcs_1/memory_tb2.txt:
Auto merged
mysql-test/std_data/funcs_1/memory_tb3.txt:
Auto merged
mysql-test/std_data/funcs_1/memory_tb4.txt:
Auto merged
mysql-test/std_data/funcs_1/myisam_tb1.txt:
Auto merged
mysql-test/std_data/funcs_1/myisam_tb2.txt:
Auto merged
mysql-test/std_data/funcs_1/myisam_tb3.txt:
Auto merged
mysql-test/std_data/funcs_1/myisam_tb4.txt:
Auto merged
mysql-test/std_data/funcs_1/t3.txt:
Auto merged
mysql-test/std_data/funcs_1/t4.txt:
Auto merged
mysql-test/std_data/funcs_1/t7.txt:
Auto merged
mysql-test/std_data/funcs_1/t9.txt:
Auto merged
mysql-test/suite/funcs_1/README.txt:
Auto merged
mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
Auto merged
mysql-test/suite/funcs_1/include/innodb_tb1.inc:
Auto merged
mysql-test/suite/funcs_1/include/innodb_tb2.inc:
Auto merged
mysql-test/suite/funcs_1/include/innodb_tb3.inc:
Auto merged
mysql-test/suite/funcs_1/include/innodb_tb4.inc:
Auto merged
mysql-test/suite/funcs_1/include/memory_tb1.inc:
Auto merged
mysql-test/suite/funcs_1/include/memory_tb2.inc:
Auto merged
mysql-test/suite/funcs_1/include/memory_tb3.inc:
Auto merged
mysql-test/suite/funcs_1/include/memory_tb4.inc:
Auto merged
mysql-test/suite/funcs_1/include/myisam_tb1.inc:
Auto merged
mysql-test/suite/funcs_1/include/myisam_tb2.inc:
Auto merged
mysql-test/suite/funcs_1/include/myisam_tb3.inc:
Auto merged
mysql-test/suite/funcs_1/include/myisam_tb4.inc:
Auto merged
mysql-test/suite/funcs_1/include/sp_tb.inc:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_views.result:
Auto merged
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
Auto merged
mysql-test/suite/funcs_1/r/is_columns_memory.result:
Auto merged
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
Auto merged
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
Auto merged
mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
Auto merged
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
Auto merged
mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
Auto merged
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
Auto merged
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
Auto merged
mysql-test/mysql-test-run.pl:
ul
ul
Bug#35335 funcs_1: Some tests fail within load_file during
pushbuild runs
Solution: 1. Move files with input data used in load_file,
load data etc.
from suite/funcs_1/<whatever>
to std_data
2. Use for testsuite funcs_1 the server option
--secure-file-priv=<MYSQLTEST_VARDIR>
3. Outfiles have to be stored under MYSQLTEST_VARDIR
+ changes according to WL#4304 Cleanup in funcs_1 tests
- backport of fixes/improvements made in 5.1 to 5.0
The differences between scripts in 5.0 and 5.1 cause
much additional and annoying work during any upmerge.
- replace error numbers with names
- improved comments
- improved formatting
- Unify storage engine names so that result files for
storage engine variants do not differ (some tests)
- remove a script no more used (tests are done in other scripts)
BitKeeper/deleted/.del-triggers_master.test:
Delete: mysql-test/suite/funcs_1/triggers/triggers_master.test
mysql-test/std_data/funcs_1/innodb_tb1.txt:
Rename: mysql-test/suite/funcs_1/data/innodb_tb1.txt -> mysql-test/std_data/funcs_1/innodb_tb1.txt
mysql-test/std_data/funcs_1/innodb_tb2.txt:
Rename: mysql-test/suite/funcs_1/data/innodb_tb2.txt -> mysql-test/std_data/funcs_1/innodb_tb2.txt
mysql-test/std_data/funcs_1/innodb_tb3.txt:
Rename: mysql-test/suite/funcs_1/data/innodb_tb3.txt -> mysql-test/std_data/funcs_1/innodb_tb3.txt
mysql-test/std_data/funcs_1/innodb_tb4.txt:
Rename: mysql-test/suite/funcs_1/data/innodb_tb4.txt -> mysql-test/std_data/funcs_1/innodb_tb4.txt
mysql-test/std_data/funcs_1/memory_tb1.txt:
Rename: mysql-test/suite/funcs_1/data/memory_tb1.txt -> mysql-test/std_data/funcs_1/memory_tb1.txt
mysql-test/std_data/funcs_1/memory_tb2.txt:
Rename: mysql-test/suite/funcs_1/data/memory_tb2.txt -> mysql-test/std_data/funcs_1/memory_tb2.txt
mysql-test/std_data/funcs_1/memory_tb3.txt:
Rename: mysql-test/suite/funcs_1/data/memory_tb3.txt -> mysql-test/std_data/funcs_1/memory_tb3.txt
mysql-test/std_data/funcs_1/memory_tb4.txt:
Rename: mysql-test/suite/funcs_1/data/memory_tb4.txt -> mysql-test/std_data/funcs_1/memory_tb4.txt
mysql-test/std_data/funcs_1/myisam_tb1.txt:
Rename: mysql-test/suite/funcs_1/data/myisam_tb1.txt -> mysql-test/std_data/funcs_1/myisam_tb1.txt
mysql-test/std_data/funcs_1/myisam_tb2.txt:
Rename: mysql-test/suite/funcs_1/data/myisam_tb2.txt -> mysql-test/std_data/funcs_1/myisam_tb2.txt
mysql-test/std_data/funcs_1/myisam_tb3.txt:
Rename: mysql-test/suite/funcs_1/data/myisam_tb3.txt -> mysql-test/std_data/funcs_1/myisam_tb3.txt
mysql-test/std_data/funcs_1/myisam_tb4.txt:
Rename: mysql-test/suite/funcs_1/data/myisam_tb4.txt -> mysql-test/std_data/funcs_1/myisam_tb4.txt
mysql-test/std_data/funcs_1/t3.txt:
Rename: mysql-test/suite/funcs_1/data/t3.txt -> mysql-test/std_data/funcs_1/t3.txt
mysql-test/std_data/funcs_1/t4.txt:
Rename: mysql-test/suite/funcs_1/data/t4.txt -> mysql-test/std_data/funcs_1/t4.txt
mysql-test/std_data/funcs_1/t7.txt:
Rename: mysql-test/suite/funcs_1/data/t7.txt -> mysql-test/std_data/funcs_1/t7.txt
mysql-test/std_data/funcs_1/t9.txt:
Rename: mysql-test/suite/funcs_1/data/t9.txt -> mysql-test/std_data/funcs_1/t9.txt
mysql-test/Makefile.am:
Introduce installation of funcs_1 files in std_data.
mysql-test/mysql-test-run.pl:
The tests within funcs_1 need a server started with
--secure-file-priv=<MYSQLTEST_VARDIR>
like the main regression tests.
mysql-test/suite/funcs_1/README.txt:
Extended description
mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
Cleanup
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
Cleanup
mysql-test/suite/funcs_1/include/innodb_tb1.inc:
Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/innodb_tb2.inc:
Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/innodb_tb3.inc:
Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/innodb_tb4.inc:
Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/memory_tb1.inc:
Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/memory_tb2.inc:
Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/memory_tb3.inc:
Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/memory_tb4.inc:
Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/myisam_tb1.inc:
Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/myisam_tb2.inc:
Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/myisam_tb3.inc:
Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/myisam_tb4.inc:
Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/sp_tb.inc:
Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/r/innodb_func_view.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_views.result:
Updated results
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
Updated results
mysql-test/suite/funcs_1/r/is_columns_memory.result:
Updated results
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
Updated results
mysql-test/suite/funcs_1/r/is_columns_ndb.result:
Updated results
mysql-test/suite/funcs_1/r/is_tables_innodb.result:
Updated results
mysql-test/suite/funcs_1/r/is_tables_memory.result:
Updated results
mysql-test/suite/funcs_1/r/is_tables_myisam.result:
Updated results
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
Updated results
mysql-test/suite/funcs_1/r/memory_func_view.result:
Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
Updated results
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
Updated results
mysql-test/suite/funcs_1/r/memory_trig_03.result:
Updated results
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
Updated results
mysql-test/suite/funcs_1/r/memory_trig_08.result:
Updated results
mysql-test/suite/funcs_1/r/memory_trig_09.result:
Updated results
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
Updated results
mysql-test/suite/funcs_1/r/memory_views.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_func_view.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
Updated results
mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
"--echo" instead of SQL command.
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
Adjustment to new storage place of infile
+ correct formatting.
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
Backport from 5.1 + correct formatting.
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
Minor improvements + correct formatting.
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
Backport from 5.1 + correct formatting
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
Backport from 5.1. + correct formatting
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
Cleanup
mysql-test/suite/funcs_1/t/is_basics_mixed.test:
Adjustment to new storage place of outfile.
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
Cleanup
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
Cleanup
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
Cleanup
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
Cleanup
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
Cleanup
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
Cleanup
mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
Cleanup
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
Cleanup
mysql-test/suite/funcs_1/triggers/triggers_03.inc:
Backport from 5.1
mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
Backport from 5.1
mysql-test/suite/funcs_1/triggers/triggers_08.inc:
Backport from 5.1
mysql-test/suite/funcs_1/triggers/triggers_09.inc:
Backport from 5.1
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
Backport from 5.1
mysql-test/suite/funcs_1/views/func_view.inc:
Backport from 5.1
mysql-test/suite/funcs_1/views/views_master.inc:
Cleanup
mysql-test/std_data/funcs_1/load_file.txt:
New BitKeeper file ``mysql-test/std_data/funcs_1/load_file.txt''
