bk commit into 5.0 tree (thek:1.2395)

[kpettersson]

Below is the list of changes that have just been committed into a local
5.0 repository of thek. When thek does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-19 10:08:27+01:00, thek@stripped +4 -0
  Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my41-bug23240
  into  kpdesk.mysql.com:/home/thek/dev/bug23240/my50-bug23240
  MERGE: 1.1616.2936.2

  BitKeeper/deleted/.del-init_file.result@stripped, 2007-02-19 10:07:42+01:00,
thek@stripped +0 -0
    Auto merged
    MERGE: 1.1.1.2

  BitKeeper/deleted/.del-init_file.result@stripped, 2007-02-19 10:07:42+01:00,
thek@stripped +0 -0
    Merge rename: mysql-test/r/init_file.result ->
BitKeeper/deleted/.del-init_file.result

  mysql-test/std_data/init_file.dat@stripped, 2007-02-19 10:07:52+01:00, thek@stripped
+0 -8
    Null merge
    MERGE: 1.3.2.2

  mysql-test/std_data/init_file.dat@stripped, 2007-02-19 10:07:42+01:00,
thek@stripped +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/init_file.test@stripped, 2007-02-19 10:07:42+01:00, thek@stripped +0 -0
    Auto merged
    MERGE: 1.6.1.2

  sql/sql_parse.cc@stripped, 2007-02-19 10:08:17+01:00, thek@stripped +0 -1
    Null merge
    MERGE: 1.271.132.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	thek
# Host:	kpdesk.mysql.com
# Root:	/home/thek/dev/bug23240/my50-bug23240/RESYNC

--- 1.3.2.1/mysql-test/std_data/init_file.dat	2007-02-19 10:08:32 +01:00
+++ 1.7/mysql-test/std_data/init_file.dat	2007-02-19 10:08:32 +01:00
@@ -1,9 +1,29 @@
 select * from mysql.user as t1, mysql.user as t2, mysql.user as t3;
+use test;
 
-#
-# 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() );
+drop table if exists t1;
+create table t1 (x int);
+drop table if exists t2;
+create table t2 (y int);
 
+drop procedure if exists p1;
+create definer=root@localhost procedure p1() select * from t1;
+call p1();
+drop procedure p1;
+
+create definer=root@localhost procedure p1() insert into t1 values (3),(5),(7);
+call p1();
+
+drop function if exists f1;
+create definer=root@localhost function f1() returns int return (select count(*) from t1);
+insert into t2 set y = f1()*10;
+
+drop view if exists v1;
+create definer=root@localhost view v1 as select f1();
+insert into t2 (y) select * from v1;
+
+create trigger trg1 after insert on t2 for each row insert into t1 values (new.y);
+insert into t2 values (11), (13);
+drop procedure p1;
+drop function f1;
+drop view v1;

--- 1.9/mysql-test/t/init_file.test	2007-02-19 10:08:32 +01:00
+++ 1.10/mysql-test/t/init_file.test	2007-02-19 10:08:32 +01:00
@@ -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
 #