diff --git a/include/plugin.h b/include/plugin.h index 6c571b8504b..b93e3bafe73 100644 --- a/include/plugin.h +++ b/include/plugin.h @@ -41,7 +41,7 @@ int _mysql_plugin_interface_version_= MYSQL_PLUGIN_INTERFACE_VERSION; \ int _mysql_sizeof_struct_st_plugin_= sizeof(struct st_mysql_plugin); \ struct st_mysql_plugin _mysql_plugin_declarations_[]= { -#define mysql_declare_plugin_end ,{0,0,0,0,0,0,0,0}} +#define mysql_declare_plugin_end ,{0,0,0,0,0,0,0,0,0}} /* declarations for SHOW STATUS support in plugins diff --git a/mysql-test/r/rpl_row_basic_11bugs.result b/mysql-test/r/rpl_row_basic_11bugs.result index 9249405ac26..a5267a2bce2 100644 --- a/mysql-test/r/rpl_row_basic_11bugs.result +++ b/mysql-test/r/rpl_row_basic_11bugs.result @@ -24,9 +24,8 @@ SHOW TABLES; Tables_in_test_ignore t2 INSERT INTO t2 VALUES (3,3), (4,4); -SHOW BINLOG EVENTS; +SHOW BINLOG EVENTS FROM 102; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.5-alpha-debug-log, Binlog ver: 4 master-bin.000001 102 Query 1 195 use `test`; CREATE TABLE t1 (a INT, b INT) master-bin.000001 195 Table_map 1 235 test.t1 master-bin.000001 235 Write_rows 1 282 diff --git a/mysql-test/t/rpl_row_basic_11bugs.test b/mysql-test/t/rpl_row_basic_11bugs.test index 76ff5a581c9..67fa11b76a0 100644 --- a/mysql-test/t/rpl_row_basic_11bugs.test +++ b/mysql-test/t/rpl_row_basic_11bugs.test @@ -17,7 +17,7 @@ USE test_ignore; CREATE TABLE t2 (a INT, b INT); SHOW TABLES; INSERT INTO t2 VALUES (3,3), (4,4); -SHOW BINLOG EVENTS; +SHOW BINLOG EVENTS FROM 102; sync_slave_with_master; --echo **** On Slave **** SHOW DATABASES; diff --git a/plugin/fulltext/plugin_example.c b/plugin/fulltext/plugin_example.c index 4caa6de3197..269c58e8b40 100644 --- a/plugin/fulltext/plugin_example.c +++ b/plugin/fulltext/plugin_example.c @@ -98,7 +98,8 @@ static int simple_parser_plugin_deinit(void) 1 failure (cannot happen) */ -static int simple_parser_init(MYSQL_FTPARSER_PARAM *param) +static int simple_parser_init(MYSQL_FTPARSER_PARAM *param + __attribute__((unused))) { return(0); } @@ -118,7 +119,8 @@ static int simple_parser_init(MYSQL_FTPARSER_PARAM *param) 1 failure (cannot happen) */ -static int simple_parser_deinit(MYSQL_FTPARSER_PARAM *param) +static int simple_parser_deinit(MYSQL_FTPARSER_PARAM *param + __attribute__((unused))) { return(0); } @@ -179,7 +181,7 @@ int simple_parser_parse(MYSQL_FTPARSER_PARAM *param) add_word(param, start, end - start); break; } - else if (isspace(*end)) + else if (my_isspace(param->cs, *end)) { if (end > start) add_word(param, start, end - start); @@ -208,7 +210,7 @@ static struct st_mysql_ftparser simple_parser_descriptor= struct st_mysql_show_var simple_status[]= { - {"static", "just a static text", SHOW_CHAR}, + {"static", (char *)"just a static text", SHOW_CHAR}, {"called", (char *)&number_of_calls, SHOW_LONG}, {0,0,0} }; @@ -227,6 +229,6 @@ mysql_declare_plugin simple_parser_plugin_init, /* init function (when loaded) */ simple_parser_plugin_deinit,/* deinit function (when unloaded) */ 0x0001, /* version */ - &simple_status /* status variables */ + simple_status /* status variables */ } mysql_declare_plugin_end; diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 29df467b916..a265d32e7c2 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1589,22 +1589,10 @@ static int write_delayed(THD *thd,TABLE *table,enum_duplicates duplic, if (thd->killed || !(row= new delayed_row(duplic, ignore, log_on))) goto err; -#if 0 - if (!query) - query_length=0; -#endif if (!(row->record= (char*) my_malloc(table->s->reclength, MYF(MY_WME)))) goto err; memcpy(row->record, table->record[0], table->s->reclength); di->set_query(query, query_length); -#if 0 - if (query_length) - { - row->query= row->record+table->s->reclength; - memcpy(row->query,query,query_length+1); - } - row->query_length= query_length; -#endif row->start_time= thd->start_time; row->query_start_used= thd->query_start_used; row->last_insert_id_used= thd->last_insert_id_used; @@ -1931,18 +1919,6 @@ bool delayed_insert::handle_inserts(void) bool using_ignore=0, using_bin_log= mysql_bin_log.is_open(); -#if 0 - /* - The actual text for the query is added to the first row in the - list. Since the row is destroyed, with all it's memory, we need - to take a copy of it to be able to log it after all rows have been - applied. - */ - uint const query_length= rows.head()->query_length; - char *const query= static_cast(my_alloca(query_length+1)); - memcpy(query, rows.head()->query, query_length); -#endif - delayed_row *row; DBUG_ENTER("handle_inserts"); @@ -2060,7 +2036,8 @@ bool delayed_insert::handle_inserts(void) pthread_mutex_unlock(&mutex); /* After releasing the mutex, to prevent deadlocks. */ - thd.binlog_query(THD::ROW_QUERY_TYPE, query, query_length, FALSE, FALSE); + if (mysql_bin_log.is_open()) + thd.binlog_query(THD::ROW_QUERY_TYPE, query, query_length, FALSE, FALSE); if ((error=table->file->extra(HA_EXTRA_NO_CACHE))) { // This shouldn't happen diff --git a/storage/ndb/config/common.mk.am b/storage/ndb/config/common.mk.am index 1fc254ef57c..a9ff5fdfc77 100644 --- a/storage/ndb/config/common.mk.am +++ b/storage/ndb/config/common.mk.am @@ -7,6 +7,6 @@ ndbapiincludedir = "$(pkgincludedir)/storage/ndb/ndbapi" mgmapiincludedir = "$(pkgincludedir)/storage/ndb/mgmapi" INCLUDES = $(INCLUDES_LOC) -LDADD = $(top_srcdir)/storage/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC) +LDADD = $(LDADD_LOC) DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) $(NDB_EXTRA_FLAGS) NDB_CXXFLAGS=@ndb_cxxflags_fix@ $(NDB_CXXFLAGS_LOC) diff --git a/storage/ndb/src/common/portlib/Makefile.am b/storage/ndb/src/common/portlib/Makefile.am index cdefa46af50..b78b3af9970 100644 --- a/storage/ndb/src/common/portlib/Makefile.am +++ b/storage/ndb/src/common/portlib/Makefile.am @@ -1,5 +1,3 @@ -noinst_HEADERS = gcc.cpp - noinst_LTLIBRARIES = libportlib.la libportlib_la_SOURCES = \ diff --git a/storage/ndb/src/common/portlib/gcc.cpp b/storage/ndb/src/common/portlib/gcc.cpp deleted file mode 100644 index 4e49d787d3c..00000000000 --- a/storage/ndb/src/common/portlib/gcc.cpp +++ /dev/null @@ -1,7 +0,0 @@ - -/** - * GCC linking problem... - */ -#if 0 -extern "C" { int __cxa_pure_virtual() { return 0;} } -#endif