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

into serg.mylan:/usr/home/serg/Abk/mysql-5.1-nl


sql/sql_yacc.yy:
  Auto merged

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

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;