Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my51-bug23240
into kpdesk.mysql.com:/home/thek/dev/mysql-5.1-runtime sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_parse.cc: Auto merged
This commit is contained in:
commit
0d6e497912
@ -1,3 +1,10 @@
|
||||
INSERT INTO init_file.startup VALUES ( NOW() );
|
||||
SELECT * INTO @X FROM init_file.startup limit 0,1;
|
||||
SELECT * INTO @Y FROM init_file.startup limit 1,1;
|
||||
SELECT YEAR(@X)-YEAR(@Y);
|
||||
YEAR(@X)-YEAR(@Y)
|
||||
0
|
||||
DROP DATABASE init_file;
|
||||
ok
|
||||
end of 4.1 tests
|
||||
select * from t1;
|
||||
|
@ -27,3 +27,12 @@ insert into t2 values (11), (13);
|
||||
drop procedure p1;
|
||||
drop function f1;
|
||||
drop view v1;
|
||||
|
||||
#
|
||||
# Bug#23240 --init-file statements with NOW() reports '1970-01-01 11:00:00'as the date time
|
||||
#
|
||||
CREATE DATABASE IF NOT EXISTS init_file;
|
||||
CREATE TABLE IF NOT EXISTS init_file.startup ( startdate DATETIME );
|
||||
INSERT INTO init_file.startup VALUES ( NOW() );
|
||||
|
||||
|
||||
|
@ -6,6 +6,15 @@
|
||||
# mysql-test/t/init_file-master.opt for the actual test
|
||||
#
|
||||
|
||||
#
|
||||
# Bug#23240 --init-file statements with NOW() reports '1970-01-01 11:00:00'as the date time
|
||||
#
|
||||
INSERT INTO init_file.startup VALUES ( NOW() );
|
||||
SELECT * INTO @X FROM init_file.startup limit 0,1;
|
||||
SELECT * INTO @Y FROM init_file.startup limit 1,1;
|
||||
SELECT YEAR(@X)-YEAR(@Y);
|
||||
DROP DATABASE init_file;
|
||||
|
||||
--echo ok
|
||||
--echo end of 4.1 tests
|
||||
#
|
||||
|
@ -8534,7 +8534,6 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
|
||||
goto ndb_util_thread_fail;
|
||||
thd->init_for_queries();
|
||||
thd->version=refresh_version;
|
||||
thd->set_time();
|
||||
thd->main_security_ctx.host_or_ip= "";
|
||||
thd->client_capabilities = 0;
|
||||
my_net_init(&thd->net, 0);
|
||||
|
@ -3496,7 +3496,6 @@ pthread_handler_t ndb_binlog_thread_func(void *arg)
|
||||
thd->command= COM_DAEMON;
|
||||
thd->system_thread= SYSTEM_THREAD_NDBCLUSTER_BINLOG;
|
||||
thd->version= refresh_version;
|
||||
thd->set_time();
|
||||
thd->main_security_ctx.host_or_ip= "";
|
||||
thd->client_capabilities= 0;
|
||||
my_net_init(&thd->net, 0);
|
||||
|
@ -357,6 +357,7 @@ void THD::init(void)
|
||||
|
||||
void THD::init_for_queries()
|
||||
{
|
||||
set_time();
|
||||
ha_enable_transaction(this,TRUE);
|
||||
|
||||
reset_root_defaults(mem_root, variables.query_alloc_block_size,
|
||||
|
@ -1210,7 +1210,6 @@ pthread_handler_t handle_one_connection(void *arg)
|
||||
thd->version= refresh_version;
|
||||
thd->proc_info= 0;
|
||||
thd->command= COM_SLEEP;
|
||||
thd->set_time();
|
||||
thd->init_for_queries();
|
||||
|
||||
if (sys_init_connect.value_length && !(sctx->master_access & SUPER_ACL))
|
||||
@ -1226,7 +1225,6 @@ pthread_handler_t handle_one_connection(void *arg)
|
||||
sql_print_warning("%s", net->last_error);
|
||||
}
|
||||
thd->proc_info=0;
|
||||
thd->set_time();
|
||||
thd->init_for_queries();
|
||||
}
|
||||
|
||||
@ -1364,6 +1362,7 @@ pthread_handler_t handle_bootstrap(void *arg)
|
||||
mode we have only one thread.
|
||||
*/
|
||||
thd->query_id=next_query_id();
|
||||
thd->set_time();
|
||||
mysql_parse(thd,thd->query,length);
|
||||
close_thread_tables(thd); // Free tables
|
||||
if (thd->is_fatal_error)
|
||||
|
Loading…
x
Reference in New Issue
Block a user