Commit a3be5294 authored by unknown's avatar unknown
Browse files

Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my50-bug23240 

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-runtime


sql/sql_parse.cc:
  Auto merged
parents 4386278e a4827679

mysql-test/r/init_file.result

+7 −0
Original line number Diff line number Diff line 
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;

mysql-test/std_data/init_file.dat

+9 −0
Original line number Diff line number Diff line
@@ -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() );

mysql-test/t/init_file.test

+9 −0
Original line number Diff line number Diff line
@@ -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

#

sql/sql_class.cc

+1 −0
Original line number Diff line number Diff line
@@ -317,6 +317,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,

sql/sql_parse.cc

+1 −2
Original line number Diff line number Diff line
@@ -1163,7 +1163,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))
@@ -1179,7 +1178,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();

    }
@@ -1313,6 +1311,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)