Commit 43f0418d authored by unknown's avatar unknown
Browse files

After merge fix 


scripts/mysql_install_db.sh:
  Cleanup
parent 956d4f4e

mysql-test/r/type_date.result

+17 −0
Original line number Diff line number Diff line
@@ -60,5 +60,22 @@ select date_add(date,INTERVAL 1 DAY),date_add(date,INTERVAL 1 SECOND) from t1; 
date_add(date,INTERVAL 1 DAY)	date_add(date,INTERVAL 1 SECOND)

2000-08-11	2000-08-10 00:00:01

2000-08-12	2000-08-11 00:00:01

drop table t1;

CREATE TABLE t1(AFIELD INT);

INSERT INTO t1 VALUES(1);

CREATE TABLE t2(GMT  VARCHAR(32));

INSERT INTO t2 VALUES('GMT-0800');

SELECT DATE_FORMAT("2002-03-06 10:11:12", CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT)) FROM t1, t2 GROUP BY t1.AFIELD;

DATE_FORMAT("2002-03-06 10:11:12", CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT))

Wed, 06 March 2002 10:11:12 GMT-0800

INSERT INTO t1 VALUES(1);

SELECT DATE_FORMAT("2002-03-06 10:11:12", CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT)), DATE_FORMAT("2002-03-06 10:11:12",  CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT)) FROM t1,t2 GROUP BY t1.AFIELD;

DATE_FORMAT("2002-03-06 10:11:12", CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT))	DATE_FORMAT("2002-03-06 10:11:12",  CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT))

Wed, 06 March 2002 10:11:12 GMT-0800	Wed, 06 March 2002 10:11:12 GMT-0800

drop table t1,t2;

CREATE TABLE t1 (f1 time default NULL, f2 time default NULL) TYPE=MyISAM;

INSERT INTO t1 (f1, f2) VALUES ('09:00', '12:00');

SELECT DATE_FORMAT(f1, "%l.%i %p") , DATE_FORMAT(f2, "%l.%i %p") FROM t1;

DATE_FORMAT(f1, "%l.%i %p")	DATE_FORMAT(f2, "%l.%i %p")

9.00 AM	12.00 PM

DROP TABLE t1;

scripts/mysql_install_db.sh

+5 −4
Original line number Diff line number Diff line
@@ -37,10 +37,11 @@ parse_arguments() { 
      --force) force=1 ;;

      --basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;

      --ldata=*|--datadir=*) ldata=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;

      --user=*) user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;

                # Note that this will be passed to mysqld so that it runs

      --user=*)

        # Note that the user will be passed to mysqld so that it runs

        # as 'user' (crucial e.g. if log-bin=/some_other_path/

        # where a chown of datadir won't help)

	 user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;

      --skip-name-resolve) ip_only=1 ;;

      --verbose) verbose=1 ;;

      --rpm) in_rpm=1 ;;