diff --git a/include/Makefile.am b/include/Makefile.am index 5b743baccb6..33e34fb512f 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -22,7 +22,7 @@ pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \ errmsg.h my_global.h my_net.h my_alloc.h \ my_getopt.h sslopt-longopts.h my_dir.h typelib.h \ sslopt-vars.h sslopt-case.h sql_common.h keycache.h \ - mysql_time.h plugin.h $(BUILT_SOURCES) + mysql_time.h mysql/plugin.h $(BUILT_SOURCES) noinst_HEADERS = config-win.h config-os2.h config-netware.h \ heap.h my_bitmap.h my_uctype.h \ myisam.h myisampack.h myisammrg.h ft_global.h\ diff --git a/include/myisam.h b/include/myisam.h index 4d55409b8b3..982982711f1 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -32,7 +32,7 @@ extern "C" { #include "keycache.h" #endif #include "my_handler.h" -#include +#include /* There is a hard limit for the maximum number of keys as there are only diff --git a/include/plugin.h b/include/mysql/plugin.h similarity index 100% rename from include/plugin.h rename to include/mysql/plugin.h diff --git a/mysql-test/r/binlog_stm_binlog.result b/mysql-test/r/binlog_stm_binlog.result index ac4ca23782d..f9180b69ab6 100644 --- a/mysql-test/r/binlog_stm_binlog.result +++ b/mysql-test/r/binlog_stm_binlog.result @@ -4,7 +4,7 @@ insert into t1 values (1,2); commit; show binlog events; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.7-beta-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 102 Server ver: #, Binlog ver: # master-bin.000001 102 Query 1 209 use `test`; create table t1 (a int, b int) engine=innodb master-bin.000001 209 Query 1 277 use `test`; BEGIN master-bin.000001 277 Query 1 90 use `test`; insert into t1 values (1,2) diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 5a8926e0638..8f839fc09a8 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -566,3 +566,21 @@ set global character_set_system = latin1; ERROR HY000: Variable 'character_set_system' is a read only variable set @@global.version_compile_os='234'; ERROR HY000: Variable 'version_compile_os' is a read only variable +set character_set_filesystem=latin1; +select @@character_set_filesystem; +@@character_set_filesystem +latin1 +set @@global.character_set_filesystem=latin2; +set character_set_filesystem=latin1; +select @@character_set_filesystem; +@@character_set_filesystem +latin1 +set @@global.character_set_filesystem=latin2; +set character_set_filesystem=default; +select @@character_set_filesystem; +@@character_set_filesystem +latin2 +set @@global.character_set_filesystem=default; +select @@global.character_set_filesystem; +@@global.character_set_filesystem +binary diff --git a/mysql-test/t/binlog_stm_binlog.test b/mysql-test/t/binlog_stm_binlog.test index d608741da0b..826ce54ae2c 100644 --- a/mysql-test/t/binlog_stm_binlog.test +++ b/mysql-test/t/binlog_stm_binlog.test @@ -5,7 +5,7 @@ create table t1 (a int, b int) engine=innodb; begin; insert into t1 values (1,2); commit; ---replace_regex /\/\* xid=.* \*\//\/* XID *\// +--replace_regex /\/\* xid=.* \*\//\/* XID *\// /Server ver: .*, Binlog ver: .*/Server ver: #, Binlog ver: #/ show binlog events; drop table t1; diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 14f3cca88cd..182a9cefcd9 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -32,3 +32,4 @@ rpl_sp : Bug#16456 rpl_until : Unstable test case, bug#15886 sp-goto : GOTO is currently is disabled - will be fixed in the future subselect : Bug#15706 (ps mode) [PATCH PENDING] +rpl_ndb_log : result not deterministic diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index eb3273a9e9b..dd645cd1d40 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -456,4 +456,18 @@ set global character_set_system = latin1; --error 1238 set @@global.version_compile_os='234'; +# +# Check character_set_filesystem variable +# +set character_set_filesystem=latin1; +select @@character_set_filesystem; +set @@global.character_set_filesystem=latin2; +set character_set_filesystem=latin1; +select @@character_set_filesystem; +set @@global.character_set_filesystem=latin2; +set character_set_filesystem=default; +select @@character_set_filesystem; +set @@global.character_set_filesystem=default; +select @@global.character_set_filesystem; + # End of 5.0 tests diff --git a/plugin/fulltext/plugin_example.c b/plugin/fulltext/plugin_example.c index 11b0822f3f8..8f84793c1e5 100644 --- a/plugin/fulltext/plugin_example.c +++ b/plugin/fulltext/plugin_example.c @@ -15,7 +15,7 @@ #include #include -#include +#include long number_of_calls= 0; /* for SHOW STATUS, see below */ diff --git a/sql/sql_plugin.h b/sql/sql_plugin.h index ce06334ffd7..52bfc44496b 100644 --- a/sql/sql_plugin.h +++ b/sql/sql_plugin.h @@ -24,7 +24,7 @@ #define SHOW_FUNC SHOW_FUNC, SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_LONGLONG, \ SHOW_LONG_STATUS, SHOW_DOUBLE_STATUS, SHOW_HAVE, \ SHOW_HA_ROWS, SHOW_SYS, SHOW_LONG_NOFLUSH -#include +#include #undef SHOW_FUNC typedef enum enum_mysql_show_type SHOW_TYPE; typedef struct st_mysql_show_var SHOW_VAR; diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 387e5e4fcfb..9ce6b72b318 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -3583,23 +3583,23 @@ static int get_schema_partitions_record(THD *thd, struct st_table_list *tables, String tmp_str; TIME time; TABLE *show_table= tables->table; - handler *file= show_table->file; + handler *file; #ifdef WITH_PARTITION_STORAGE_ENGINE - partition_info *part_info= show_table->part_info; + partition_info *part_info; #endif DBUG_ENTER("get_schema_partitions_record"); if (res) { -#ifdef WITH_PARTITION_STORAGE_ENGINE - if (part_info) + if (!tables->view) push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, thd->net.last_errno, thd->net.last_error); -#endif thd->clear_error(); DBUG_RETURN(0); } + file= show_table->file; #ifdef WITH_PARTITION_STORAGE_ENGINE + part_info= show_table->part_info; if (part_info) { partition_element *part_elem; diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc index bc228d5c767..3425a8735c7 100644 --- a/storage/csv/ha_tina.cc +++ b/storage/csv/ha_tina.cc @@ -51,7 +51,7 @@ TODO: #include "ha_tina.h" #include -#include +#include /* Stuff for shares */ pthread_mutex_t tina_mutex; diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc index 0e9dcf231d9..dff36e10b1a 100644 --- a/storage/example/ha_example.cc +++ b/storage/example/ha_example.cc @@ -70,7 +70,7 @@ #include "mysql_priv.h" #include "ha_example.h" -#include +#include static handler* example_create_handler(TABLE_SHARE *table); static int example_init_func(); diff --git a/storage/myisam/ftdefs.h b/storage/myisam/ftdefs.h index 800b911b425..175f34df102 100644 --- a/storage/myisam/ftdefs.h +++ b/storage/myisam/ftdefs.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include #define true_word_char(s,X) (my_isalnum(s,X) || (X)=='_') #define misc_word_char(X) 0