Commit 8b9ecce0 authored by unknown's avatar unknown
Browse files

Fixed http address in some scripts (Bug #3460) 

Output TIMESTAMP in 4.1 format for 4.1 tables (or for TIMESTAMP(19)) (portability fix)
Fixed that INTERVAL can handle big integers. (Bug #3498)
Fixed that hostname="" works identical as hostname="%" for table/column grants (Bug #3473)


mysql-test/mysql-test-run.sh:
  Fixed wrong http address (Bug #3460)
mysql-test/r/func_time.result:
  Results for new test cases
mysql-test/t/func_time.test:
  Added test of INTERVAL with big integers
scripts/mysqld_safe.sh:
  Added html address to manual in case of error
sql/field.cc:
  Output TIMESTAMP in 4.1 format for 4.1 tables (or for TIMESTAMP(19))
sql/item_timefunc.cc:
  Fixed that INTERVAL can handle big integers. (Bug #3498)
sql/mysql_priv.h:
  Removed not needed prototype
sql/sql_acl.cc:
  Fixed that hostname="" works identical as hostname="%" for table/column grants (Bug #3473)
  Moved GRANT_TABLE::GRANT_TABLE functions ou from class definition to make it possible to debug them
sql/structs.h:
  Fix for long values to INTERVAL
parent b0a8fde8

mysql-test/mysql-test-run.sh

+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ show_failed_diff () 
    $DIFF -c $result_file $reject_file

    echo "-------------------------------------------------------"

    echo "Please follow the instructions outlined at"

    echo "http://www.mysql.com/doc/R/e/Reporting_mysqltest_bugs.html"

    echo "http://www.mysql.com/doc/en/Reporting_mysqltest_bugs.html"

    echo "to find the reason to this problem and how to report this."

  fi

}

mysql-test/r/func_time.result

+30 −0
Original line number Diff line number Diff line
@@ -352,6 +352,36 @@ extract(SECOND FROM "1999-01-02 10:11:12") 
select extract(MONTH FROM "2001-02-00");

extract(MONTH FROM "2001-02-00")

2

SELECT "1900-01-01 00:00:00" + INTERVAL 2147483648 SECOND;

"1900-01-01 00:00:00" + INTERVAL 2147483648 SECOND

1968-01-20 03:14:08

SELECT "1900-01-01 00:00:00" + INTERVAL "1:2147483647" MINUTE_SECOND;

"1900-01-01 00:00:00" + INTERVAL "1:2147483647" MINUTE_SECOND

1968-01-20 03:15:07

SELECT "1900-01-01 00:00:00" + INTERVAL "100000000:214748364700" MINUTE_SECOND;

"1900-01-01 00:00:00" + INTERVAL "100000000:214748364700" MINUTE_SECOND

8895-03-27 22:11:40

SELECT "1900-01-01 00:00:00" + INTERVAL 1<<37 SECOND;

"1900-01-01 00:00:00" + INTERVAL 1<<37 SECOND

6255-04-08 15:04:32

SELECT "1900-01-01 00:00:00" + INTERVAL 1<<31 MINUTE;

"1900-01-01 00:00:00" + INTERVAL 1<<31 MINUTE

5983-01-24 02:08:00

SELECT "1900-01-01 00:00:00" + INTERVAL 1<<20 HOUR;

"1900-01-01 00:00:00" + INTERVAL 1<<20 HOUR

2019-08-15 16:00:00

SELECT "1900-01-01 00:00:00" + INTERVAL 1<<38 SECOND;

"1900-01-01 00:00:00" + INTERVAL 1<<38 SECOND

NULL

SELECT "1900-01-01 00:00:00" + INTERVAL 1<<33 MINUTE;

"1900-01-01 00:00:00" + INTERVAL 1<<33 MINUTE

NULL

SELECT "1900-01-01 00:00:00" + INTERVAL 1<<30 HOUR;

"1900-01-01 00:00:00" + INTERVAL 1<<30 HOUR

NULL

SELECT "1900-01-01 00:00:00" + INTERVAL "1000000000:214748364700" MINUTE_SECOND;

"1900-01-01 00:00:00" + INTERVAL "1000000000:214748364700" MINUTE_SECOND

NULL

create table t1 (ctime varchar(20));

insert into t1 values ('2001-01-12 12:23:40');

select ctime, hour(ctime) from t1;

mysql-test/t/func_time.test

+18 −1
Original line number Diff line number Diff line
@@ -136,10 +136,27 @@ select extract(MINUTE_SECOND FROM "10:11:12"); 
select extract(SECOND FROM "1999-01-02 10:11:12");

select extract(MONTH FROM "2001-02-00");



#

# Test big intervals (Bug #3498)

#

SELECT "1900-01-01 00:00:00" + INTERVAL 2147483648 SECOND;

SELECT "1900-01-01 00:00:00" + INTERVAL "1:2147483647" MINUTE_SECOND;

SELECT "1900-01-01 00:00:00" + INTERVAL "100000000:214748364700" MINUTE_SECOND;SELECT "1900-01-01 00:00:00" + INTERVAL 1<<37 SECOND;

SELECT "1900-01-01 00:00:00" + INTERVAL 1<<31 MINUTE;

SELECT "1900-01-01 00:00:00" + INTERVAL 1<<20 HOUR;



SELECT "1900-01-01 00:00:00" + INTERVAL 1<<38 SECOND;

SELECT "1900-01-01 00:00:00" + INTERVAL 1<<33 MINUTE;

SELECT "1900-01-01 00:00:00" + INTERVAL 1<<30 HOUR;

SELECT "1900-01-01 00:00:00" + INTERVAL "1000000000:214748364700" MINUTE_SECOND;



#

# Bug #614 (multiple extracts in where)

#



create table t1 (ctime varchar(20));

insert into t1 values ('2001-01-12 12:23:40');

select ctime, hour(ctime) from t1;

# test bug 614 (multiple extracts in where)

select ctime from t1 where extract(MONTH FROM ctime) = 1 AND extract(YEAR FROM ctime) = 2001;

drop table t1;

scripts/mysqld_safe.sh

+2 −0
Original line number Diff line number Diff line
@@ -162,6 +162,8 @@ then 
  echo "Please do a cd to the mysql installation directory and restart"

  echo "this script from there as follows:"

  echo "./bin/mysqld_safe".

  echo "See http://dev.mysql.com/doc/mysql/en/mysqld_safe.html for more"

  echo "information"

  exit 1

fi

sql/field.cc

+1 −1
Original line number Diff line number Diff line
@@ -2668,7 +2668,7 @@ String *Field_timestamp::val_str(String *val_buffer, 
  time_t time_arg;

  struct tm *l_time;

  struct tm tm_tmp;

  my_bool new_format= (current_thd->variables.new_mode),

  my_bool new_format= (current_thd->variables.new_mode) || field_length == 19,

          full_year=(field_length == 8 || field_length == 14 || new_format);

  int real_field_length= new_format ? 19 : field_length;