mirror of
https://github.com/MariaDB/server.git
synced 2026-04-22 00:05:33 +02:00
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into zim.(none):/home/brian/mysql/cluster-5.1 libmysqld/Makefile.am: Auto merged
This commit is contained in:
unknown
commit
2f7d041665
7 changed files with 8 additions and 139 deletions
49
ChangeLog
49
ChangeLog
|
|
@ -1,49 +0,0 @@
|
|||
2005-09-25 Mats Kindahl <mats@mysql.com>
|
||||
|
||||
* sql/log_event.cc (find_and_fetch_row): Added the optimization
|
||||
that if a record is found using a key with HA_NOSAME flag set, we
|
||||
do not need to compare records to see if it is the correct one.
|
||||
|
||||
2005-09-23 Mats Kindahl <mats@mysql.com>
|
||||
|
||||
* sql/log_event.cc (replace_record): Added function to overwrite
|
||||
existing row if there were a duplicate key.
|
||||
|
||||
2005-09-17 Mats Kindahl <mats@mysql.com>
|
||||
|
||||
* mysql-test/t/rpl_row_multi_query.test: This test is explicitly
|
||||
for testing that multi-queries are logged as one Query_log_event
|
||||
per sub-query instead of one Query_log_event for the entire
|
||||
multi-query.
|
||||
|
||||
The test was removed
|
||||
|
||||
* mysql-test/t/rpl_stm_flsh_tbls.test: Added rename_event_pos
|
||||
parameter.
|
||||
|
||||
* mysql-test/t/rpl_row_flsh_tbls.test: Added rename_event_pos
|
||||
parameter.
|
||||
|
||||
* mysql-test/extra/rpl_tests/rpl_flsh_tbls.test: Takes one
|
||||
additional parameter with the position of the RENAME TABLE
|
||||
event. The SHOW BINLOG EVENTS is only used to check the presence
|
||||
of the RENAME TABLE event and the FLUSH TABLES event.
|
||||
|
||||
2005-09-16 Mats Kindahl <mats@mysql.com>
|
||||
|
||||
* mysql-test/t/rpl_row_err_ignoredtable.test: This test is
|
||||
statement-oriented since it tests that errorneous statements are
|
||||
sent through the binlog. This does not happen with RBR, since
|
||||
statements are not replicated through the binlog.
|
||||
|
||||
Test was removed.
|
||||
|
||||
* mysql-test/t/rpl_row_loaddata_m.test: This test is purely
|
||||
statement-based, so it was removed as a test for row-based
|
||||
logging. The LOAD DATA is not replicated as two statements, but
|
||||
is rather replicated using row-based events, and this is a test
|
||||
that the correct events are put into the binary log on execution
|
||||
of LOAD DATA INFILE.
|
||||
|
||||
Test was removed.
|
||||
|
||||
|
|
@ -460,10 +460,6 @@ SOURCE=.\ha_archive.cpp
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\examples\ha_example.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\ha_blackhole.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
|
|||
|
|
@ -1490,87 +1490,6 @@
|
|||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="examples\ha_example.cpp">
|
||||
<FileConfiguration
|
||||
Name="classic nt|Win32"
|
||||
ExcludedFromBuild="TRUE">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Max|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Max nt|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="nt|Win32"
|
||||
ExcludedFromBuild="TRUE">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="pro nt|Win32"
|
||||
ExcludedFromBuild="TRUE">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="pro|Win32"
|
||||
ExcludedFromBuild="TRUE">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="classic|Win32"
|
||||
ExcludedFromBuild="TRUE">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
ExcludedFromBuild="TRUE">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="ha_federated.cpp">
|
||||
<FileConfiguration
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
|
|||
libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)
|
||||
EXTRA_libmysqld_a_SOURCES = ha_innodb.cc ha_berkeley.cc ha_archive.cc \
|
||||
ha_blackhole.cc ha_federated.cc ha_ndbcluster.cc \
|
||||
ha_tina.cc ha_example.cc ha_partition.cc
|
||||
ha_partition.cc
|
||||
libmysqld_a_DEPENDENCIES= @mysql_se_objs@
|
||||
libmysqld_a_SOURCES=
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,6 @@ group_min_max : Bug #15448
|
|||
innodb_concurrent : Results are not deterministic, Elliot will fix (BUG#3300)
|
||||
subselect : Bug#15706
|
||||
type_time : Bug#15805
|
||||
rpl000002 : Bug#15920 Temporary tables are not binlogged in SBR
|
||||
#rpl000002 : Bug#15920 Temporary tables are not binlogged in SBR
|
||||
ps_7ndb : Bug#15923 Core dump in RBR mode when executing test suite
|
||||
sp_trans : Bug#15924 Code dump in RBR mode when executing test suite
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
|
|||
sql_error.h field.h handler.h mysqld_suffix.h \
|
||||
ha_heap.h ha_myisam.h ha_myisammrg.h ha_partition.h \
|
||||
opt_range.h protocol.h rpl_tblmap.h \
|
||||
log.h sql_show.h rpl_rli.h \
|
||||
sql_select.h structs.h table.h sql_udf.h hash_filo.h\
|
||||
lex.h lex_symbol.h sql_acl.h sql_crypt.h \
|
||||
log_event.h sql_repl.h slave.h rpl_filter.h \
|
||||
|
|
|
|||
|
|
@ -1915,10 +1915,12 @@ bool mysql_create_table(THD *thd,const char *db, const char *table_name,
|
|||
- It is an internal temporary table,
|
||||
- Row-based logging is used and it we are creating a temporary table, or
|
||||
- The binary log is not open.
|
||||
Otherwise, the statement shall be binlogged.
|
||||
*/
|
||||
if (!internal_tmp_table &&
|
||||
!(binlog_row_based &&
|
||||
(create_info->options & HA_LEX_CREATE_TMP_TABLE)))
|
||||
(!binlog_row_based ||
|
||||
(binlog_row_based &&
|
||||
!(create_info->options & HA_LEX_CREATE_TMP_TABLE))))
|
||||
write_bin_log(thd, TRUE, thd->query, thd->query_length);
|
||||
error= FALSE;
|
||||
unlock_and_end:
|
||||
|
|
@ -3112,7 +3114,7 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table,
|
|||
Case 3 and 4 does nothing under RBR
|
||||
*/
|
||||
}
|
||||
else if (!(create_info->options & HA_LEX_CREATE_TMP_TABLE))
|
||||
else
|
||||
write_bin_log(thd, TRUE, thd->query, thd->query_length);
|
||||
|
||||
res= FALSE;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue