Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged

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\

include/myisam.h

@@ -32,7 +32,7 @@ extern "C" {
 #include "keycache.h"
 #endif
 #include "my_handler.h"
-#include <plugin.h>
+#include <mysql/plugin.h>
 
 /*
   There is a hard limit for the maximum number of keys as there are only

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)

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

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;
 

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

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

plugin/fulltext/plugin_example.c

@@ -15,7 +15,7 @@
 
 #include <stdlib.h>
 #include <ctype.h>
-#include <plugin.h>
+#include <mysql/plugin.h>
 
 long number_of_calls= 0; /* for SHOW STATUS, see below */
 

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 <plugin.h>
+#include <mysql/plugin.h>
 #undef SHOW_FUNC
 typedef enum enum_mysql_show_type SHOW_TYPE;
 typedef struct st_mysql_show_var SHOW_VAR;

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;

storage/csv/ha_tina.cc

@@ -51,7 +51,7 @@ TODO:
 #include "ha_tina.h"
 #include <sys/mman.h>
 
-#include <plugin.h>
+#include <mysql/plugin.h>
 
 /* Stuff for shares */
 pthread_mutex_t tina_mutex;

storage/example/ha_example.cc

@@ -70,7 +70,7 @@
 #include "mysql_priv.h"
 #include "ha_example.h"
 
-#include <plugin.h>
+#include <mysql/plugin.h>
 
 static handler* example_create_handler(TABLE_SHARE *table);
 static int example_init_func();

storage/myisam/ftdefs.h

@@ -22,7 +22,7 @@
 #include <m_ctype.h>
 #include <my_tree.h>
 #include <queues.h>
-#include <plugin.h>
+#include <mysql/plugin.h>
 
 #define true_word_char(s,X)	(my_isalnum(s,X) || (X)=='_')
 #define misc_word_char(X)	0