diff --git a/Build-tools/Bootstrap b/Build-tools/Bootstrap index 8b769dca3c4..64f865362ca 100755 --- a/Build-tools/Bootstrap +++ b/Build-tools/Bootstrap @@ -278,7 +278,7 @@ if (defined $opt_changelog) unless ($opt_skip_manual) { &logger("Updating manual files"); - foreach $file qw/internals manual reservedwords/ + foreach $file qw/internals manual reservedwords errmsg-table cl-errmsg-table/ { system ("bk cat $opt_docdir/Docs/$file.texi > $target_dir/Docs/$file.texi") == 0 or &abort("Could not update $file.texi in $target_dir/Docs/!"); diff --git a/VC++Files/libmysqld/libmysqld.dsp b/VC++Files/libmysqld/libmysqld.dsp index bb31a8ada43..c5c40b07dfd 100644 --- a/VC++Files/libmysqld/libmysqld.dsp +++ b/VC++Files/libmysqld/libmysqld.dsp @@ -344,7 +344,7 @@ SOURCE=..\mysys\my_alloc.c # End Source File # Begin Source File -SOURCE=..\mysys\my_decimal.cpp +SOURCE=..\sql\my_decimal.cpp # End Source File # Begin Source File diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index f3a42d75258..f2b99b7074a 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -656,7 +656,6 @@ delete from t1| drop table if exists t3| create table t3 ( s char(16), d int)| call into_test4()| -Warnings: select * from t3| s d into4 NULL @@ -1344,9 +1343,7 @@ end if; insert into t4 values (2, rc, t3); end| call bug1863(10)| -Warnings: call bug1863(10)| -Warnings: select * from t4| f1 rc t3 2 0 NULL @@ -1643,9 +1640,7 @@ begin end| call bug4579_1()| call bug4579_1()| -Warnings: call bug4579_1()| -Warnings: drop procedure bug4579_1| drop procedure bug4579_2| drop table t3| @@ -2118,12 +2113,16 @@ var call bug7743("OneWord")| var NULL +Warnings: +Warning 1329 No data to FETCH call bug7743("anotherword")| var 2 call bug7743("AnotherWord")| var NULL +Warnings: +Warning 1329 No data to FETCH drop procedure bug7743| drop table t4| delete from t3| diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test index c8adff32eb7..8a9d96d4946 100644 --- a/mysql-test/t/kill.test +++ b/mysql-test/t/kill.test @@ -44,7 +44,7 @@ select get_lock("a", 10); connection con2; let $ID= `select connection_id()`; send select get_lock("a", 10); --- sleep 2 +--real_sleep 2; connection con1; disable_query_log; eval kill query $ID; diff --git a/sql/examples/ha_archive.cc b/sql/examples/ha_archive.cc index 98ed65fc786..e0c9173f8da 100644 --- a/sql/examples/ha_archive.cc +++ b/sql/examples/ha_archive.cc @@ -575,7 +575,7 @@ error: int ha_archive::write_row(byte * buf) { z_off_t written; - uint *ptr, *end; + uint *bptr, *end; DBUG_ENTER("ha_archive::write_row"); if (share->crashed) @@ -596,16 +596,16 @@ int ha_archive::write_row(byte * buf) We should probably mark the table as damagaged if the record is written but the blob fails. */ - for (ptr= table->s->blob_field, end=ptr + table->s->blob_fields ; - ptr != end ; - ptr++) + for (bptr= table->s->blob_field, end=bptr + table->s->blob_fields ; + bptr != end ; + bptr++) { char *ptr; - uint32 size= ((Field_blob*) table->field[*ptr])->get_length(); + uint32 size= ((Field_blob*) table->field[*bptr])->get_length(); if (size) { - ((Field_blob*) table->field[*ptr])->get_ptr(&ptr); + ((Field_blob*) table->field[*bptr])->get_ptr(&ptr); written= gzwrite(share->archive_write, ptr, (unsigned)size); if (written != size) goto error; diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 85cbfb80def..98f39fdf0ac 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -5783,8 +5783,11 @@ extern "C" pthread_handler_decl(ndb_util_thread_func, continue; } + /* Round tim e from millisceonds to seconds */ + uint wait_secs= ((ndb_cache_check_time+999)/1000); + DBUG_PRINT("ndb_util_thread", ("wait_secs: %d", wait_secs)); /* Set new time to wake up */ - set_timespec(abstime, ndb_cache_check_time); + set_timespec(abstime, wait_secs); /* Lock mutex and fill list with pointers to all open tables */ NDB_SHARE *share; @@ -5793,7 +5796,6 @@ extern "C" pthread_handler_decl(ndb_util_thread_func, { share= (NDB_SHARE *)hash_element(&ndbcluster_open_tables, i); share->use_count++; /* Make sure the table can't be closed */ - DBUG_PRINT("ndb_util_thread", ("Found open table[%d]: %s, use_count: %d", i, share->table_name, share->use_count)); diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 7c625c208e1..2d4a1c3a0ad 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -171,6 +171,12 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset; #define FLUSH_TIME 0 /* Don't flush tables */ #define MAX_CONNECT_ERRORS 10 // errors before disabling host +#ifdef HAVE_INNOBASE_DB +#define IF_INNOBASE_DB(A, B) (A) +#else +#define IF_INNOBASE_DB(A, B) (B) +#endif + #if defined(__WIN__) || defined(OS2) #define IF_WIN(A,B) (A) #undef FLUSH_TIME diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 9013a7f5c3d..c230f976adc 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4668,7 +4668,7 @@ Disable with --skip-ndbcluster (will save memory).", (gptr*) &opt_ndb_optimized_node_selection, 0, GET_BOOL, OPT_ARG, 1, 0, 0, 0, 0, 0}, { "ndb-cache-check-time", OPT_NDB_CACHE_CHECK_TIME, - "A dedicated thread is created to update cached commit count value at the given interval.", + "A dedicated thread is created to, at the given millisecons interval, invalidate the query cache if another MySQL server in the cluster has changed the data in the database.", (gptr*) &opt_ndb_cache_check_time, (gptr*) &opt_ndb_cache_check_time, 0, GET_ULONG, REQUIRED_ARG, 0, 0, LONG_TIMEOUT, 0, 1, 0}, #endif diff --git a/sql/protocol.cc b/sql/protocol.cc index f31462ddad1..e14262fdbe0 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -359,7 +359,9 @@ send_eof(THD *thd, bool no_flush) if (thd->client_capabilities & CLIENT_PROTOCOL_41) { uchar buff[5]; - uint tmp= min(thd->total_warn_count, 65535); + /* Don't send warn count during SP execution, as the warn_list + is cleared between substatements, and mysqltest gets confused */ + uint tmp= (thd->spcont ? 0 : min(thd->total_warn_count, 65535)); buff[0]=254; int2store(buff+1, tmp); /* diff --git a/sql/sql_map.cc b/sql/sql_map.cc index e557840957e..4bb3482c7e6 100644 --- a/sql/sql_map.cc +++ b/sql/sql_map.cc @@ -19,9 +19,8 @@ #pragma implementation // gcc: Class implementation #endif -#include - #include "mysql_priv.h" +#include #ifdef HAVE_SYS_MMAN_H #include #endif diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 1e22d7c9f83..8ba4e1e3a84 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1810,9 +1810,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd, TABLE_LIST table_list; LEX_STRING conv_name; /* Saved variable value */ -#ifdef HAVE_INNOBASE_DB - my_bool old_innodb_table_locks= thd->variables.innodb_table_locks; -#endif + my_bool old_innodb_table_locks= + IF_INNOBASE_DB(thd->variables.innodb_table_locks, FALSE); statistic_increment(thd->status_var.com_stat[SQLCOM_SHOW_FIELDS], @@ -2340,9 +2339,8 @@ mysql_execute_command(THD *thd) /* Locked closure of all tables */ TABLE_LIST *locked_tables= NULL; /* Saved variable value */ -#ifdef HAVE_INNOBASE_DB - my_bool old_innodb_table_locks= thd->variables.innodb_table_locks; -#endif + my_bool old_innodb_table_locks= + IF_INNOBASE_DB(thd->variables.innodb_table_locks, FALSE); DBUG_ENTER("mysql_execute_command"); thd->net.no_send_error= 0; @@ -4189,6 +4187,12 @@ unsent_create_error: thd->row_count_func= 0; res= sp->execute_procedure(thd, &lex->value_list); + /* If warnings have been cleared, we have to clear total_warn_count + * too, otherwise the clients get confused. + */ + if (thd->warn_list.is_empty()) + thd->total_warn_count= 0; + thd->variables.select_limit= select_limit; #ifndef NO_EMBEDDED_ACCESS_CHECKS sp_restore_security_context(thd, sp, &save_ctx); diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 7aa1c968d4b..2f459d40de7 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -11404,8 +11404,8 @@ find_order_in_list(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables, in is field of view table => check that references on translation table are same */ - ((*select_item)->type() == Item::Item::REF_ITEM && - view_ref->type() == Item::Item::REF_ITEM && + ((*select_item)->type() == Item::REF_ITEM && + view_ref->type() == Item::REF_ITEM && ((Item_ref *) (*select_item))->ref == ((Item_ref *) view_ref)->ref))) /*