Commit 70d8ae01 authored by unknown's avatar unknown
Browse files

mysql-test/r/flush_block_commit.result 

    correct result after bugfix
sql/sql_class.cc
    initialize net.query_cache_query


mysql-test/r/flush_block_commit.result:
  correct result after bugfix
sql/sql_class.cc:
  initialize net.query_cache_query
sql/sql_yacc.yy:
  oops
parent b59dc1e8

mysql-test/r/flush_block_commit.result

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ master-bin.000001 98 
 commit;

show master status;

File	Position	Binlog_Do_DB	Binlog_Ignore_DB

master-bin.000001	276		

master-bin.000001	98		

unlock tables;

drop table t1;

set autocommit=1;

sql/sql_class.cc

+4 −3
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ THD::THD() 
  net.vio=0;

#endif

  net.last_error[0]=0;                          // If error on boot

  net.query_cache_query=0;                      // If error on boot

  ull=0;

  system_thread= cleanup_done= abort_on_warning= no_warnings_for_error= 0;

  peer_port= 0;					// For SHOW PROCESSLIST

sql/sql_yacc.yy

+1 −0
Original line number Diff line number Diff line
@@ -7368,6 +7368,7 @@ keyword: 
	| TIMESTAMP_DIFF	{}

	| TIME_SYM		{}

	| TYPES_SYM		{}

        | TYPE_SYM              {}

        | UDF_RETURNS_SYM       {}

	| FUNCTION_SYM		{}

	| UNCOMMITTED_SYM	{}