diff options
| author | unknown <serg@serg.mylan> | 2005-04-12 23:08:19 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-04-12 23:08:19 +0200 |
| commit | 33d268951b48482ef103d9c96e114092657499a9 (patch) | |
| tree | a98100ebe04d5a22d1b07834b5754be535ed2e7e | |
| parent | 069c62a75f045a0d8df82c8a77b19337c901f8c9 (diff) | |
| download | mariadb-git-33d268951b48482ef103d9c96e114092657499a9.tar.gz | |
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
| -rw-r--r-- | mysql-test/r/flush_block_commit.result | 2 | ||||
| -rw-r--r-- | sql/sql_class.cc | 7 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/r/flush_block_commit.result b/mysql-test/r/flush_block_commit.result index 39f4a3719ef..2f6aca7e24a 100644 --- a/mysql-test/r/flush_block_commit.result +++ b/mysql-test/r/flush_block_commit.result @@ -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; diff --git a/sql/sql_class.cc b/sql/sql_class.cc index c68dc826147..a6a1f4d60ef 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -202,10 +202,11 @@ THD::THD() #ifndef DBUG_OFF dbug_sentry=THD_SENTRY_MAGIC; #endif -#ifndef EMBEDDED_LIBRARY +#ifndef EMBEDDED_LIBRARY net.vio=0; #endif - net.last_error[0]=0; // If error on boot + 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 @@ -214,7 +215,7 @@ THD::THD() #endif #ifdef SIGNAL_WITH_VIO_CLOSE active_vio = 0; -#endif +#endif pthread_mutex_init(&LOCK_delete, MY_MUTEX_INIT_FAST); /* Variables with default values */ diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 2c493e27581..9a7e75b770c 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -7368,6 +7368,7 @@ keyword: | TIMESTAMP_DIFF {} | TIME_SYM {} | TYPES_SYM {} + | TYPE_SYM {} | UDF_RETURNS_SYM {} | FUNCTION_SYM {} | UNCOMMITTED_SYM {} |