Commit eb9b3fdc authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mishka.local:/home/my/mysql-5.0


mysql-test/r/information_schema.result:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents 78154083 72340a48

include/my_global.h

+7 −7
Original line number Diff line number Diff line
@@ -934,9 +934,9 @@ typedef char bool; /* Ordinary boolean values 0 1 */ 
}

#define set_timespec_nsec(ABSTIME,NSEC) \

{ \

  ulonglong now= my_getsystime(); \

  (ABSTIME).ts_sec= (now / ULL(10000000)) + (NSEC / ULL(1000000000)); \

  (ABSTIME).ts_nsec= (now % ULL(10000000)) * 100 + (NSEC % ULL(1000000000)); \

  ulonglong now= my_getsystime() + (NSEC/100); \

  (ABSTIME).ts_sec=  (now / ULL(10000000)); \

  (ABSTIME).ts_nsec= (now % ULL(10000000) * 100 + ((NSEC) % 100)); \

}

#else

#define set_timespec(ABSTIME,SEC) \
@@ -948,9 +948,9 @@ typedef char bool; /* Ordinary boolean values 0 1 */ 
}

#define set_timespec_nsec(ABSTIME,NSEC) \

{\

  ulonglong now= my_getsystime(); \

  (ABSTIME).tv_sec= (now / ULL(10000000)) + (NSEC / ULL(1000000000)); \

  (ABSTIME).tv_nsec= (now % ULL(10000000)) * 100 + (NSEC % ULL(1000000000)); \

  ulonglong now= my_getsystime() + (NSEC/100); \

  (ABSTIME).tv_sec=  (now / ULL(10000000)); \

  (ABSTIME).tv_nsec= (now % ULL(10000000) * 100 + ((NSEC) % 100));    \

}

#endif /* HAVE_TIMESPEC_TS_SEC */

#endif /* set_timespec */

mysql-test/r/information_schema.result

+4 −0
Original line number Diff line number Diff line
@@ -966,4 +966,8 @@ column_name column_default 
a	NULL

b	NULL

use test;

show columns from t1;

Field	Type	Null	Key	Default	Extra

a	int(11)	NO			

b	int(11)	YES		NULL	

drop table t1;

mysql-test/r/sp-security.result

+2 −0
Original line number Diff line number Diff line
@@ -245,6 +245,8 @@ end// 
grant usage on *.* to mysqltest_1@localhost;

call mysqltest_1.p1();

ERROR 42000: execute command denied to user 'mysqltest_1'@'localhost' for routine 'mysqltest_1.p1'

call mysqltest_1.p1();

ERROR 42000: execute command denied to user 'mysqltest_1'@'localhost' for routine 'mysqltest_1.p1'

drop procedure mysqltest_1.p1;

drop database mysqltest_1;

revoke usage on *.* from mysqltest_1@localhost;

mysql-test/t/information_schema.test

+1 −0
Original line number Diff line number Diff line
@@ -649,4 +649,5 @@ use information_schema; 
select column_name, column_default from columns

  where table_schema='test' and table_name='t1';

use test;

show columns from t1;

drop table t1;

mysql-test/t/sp-security.test

+6 −0
Original line number Diff line number Diff line
@@ -397,6 +397,12 @@ connection n1; 
--error 1370

call mysqltest_1.p1();

disconnect n1;

# Test also without a current database

connect (n2,localhost,mysqltest_1,,*NO-ONE*,$MASTER_MYPORT,$MASTER_MYSOCK);

connection n2;

--error 1370

call mysqltest_1.p1();

disconnect n2;



connection default;