database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Portability fixes

Browse Source 
Fixed some wrong column specifications in mysql_fix_privilege_tables
This commit is contained in:
monty@mysql.com
2004-03-19 18:26:02 +02:00
parent f375eb50f8
commit 9a1baf7d62
7 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/mysql-test-run.sh
View File

@ -17,7 +17,7 @@ MY_TZ=GMT-3
TZ=$MY_TZ; export TZ # for UNIX_TIMESTAMP tests to work TZ=$MY_TZ; export TZ # for UNIX_TIMESTAMP tests to work
# For query_cache test # For query_cache test
case "$SYSTEM" in case `uname` in
SCO_SV | UnixWare | OpenUNIX ) SCO_SV | UnixWare | OpenUNIX )
# do nothing (Causes strange behavior) # do nothing (Causes strange behavior)
;; ;;

9
mysql-test/r/func_math.result
View File

@ -59,12 +59,3 @@ ASIN(0.8+0.2)
SELECT ASIN(1.2-0.2); SELECT ASIN(1.2-0.2);
ASIN(1.2-0.2) ASIN(1.2-0.2)
1.570796 1.570796
select floor(log(4)/log(2));
floor(log(4)/log(2))
2
select floor(log(8)/log(2));
floor(log(8)/log(2))
3
select floor(log(16)/log(2));
floor(log(16)/log(2))
4

2
mysql-test/r/rpl_error_ignored_table.result
View File

@ -26,7 +26,7 @@ select (@id := id) - id from t3;
0 0
kill @id; kill @id;
drop table t2,t3; drop table t2,t3;
Server shutdown in progress Got one of the listed errors
show binlog events from 79; show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 79 Query 1 79 use `test`; create table t1 (a int primary key) master-bin.001 79 Query 1 79 use `test`; create table t1 (a int primary key)

7
mysql-test/t/func_math.test
View File

@ -33,6 +33,7 @@ SELECT ASIN(1.2-0.2);
# Bug #3051 FLOOR returns invalid # Bug #3051 FLOOR returns invalid
# #
select floor(log(4)/log(2)); # This can't be tested as it's not portable
select floor(log(8)/log(2)); #select floor(log(4)/log(2));
select floor(log(16)/log(2)); #select floor(log(8)/log(2));
#select floor(log(16)/log(2));

2
mysql-test/t/rpl_error_ignored_table.test
View File

@ -44,7 +44,7 @@ select (@id := id) - id from t3;
kill @id; kill @id;
drop table t2,t3; drop table t2,t3;
connection master; connection master;
--error 1053; --error 1053,0;
reap; reap;
connection master1; connection master1;
show binlog events from 79; show binlog events from 79;

2
scripts/mysql_fix_privilege_tables.sh
View File

@ -116,7 +116,7 @@ $cmd <<END_OF_DATA
alter table user change password password char(16) NOT NULL; alter table user change password password char(16) NOT NULL;
alter table user add File_priv enum('N','Y') NOT NULL; alter table user add File_priv enum('N','Y') NOT NULL;
CREATE TABLE if not exists func ( CREATE TABLE if not exists func (
name char(64) DEFAULT '' NOT NULL, name char(64) binary DEFAULT '' NOT NULL,
ret tinyint(1) DEFAULT '0' NOT NULL, ret tinyint(1) DEFAULT '0' NOT NULL,
dl char(128) DEFAULT '' NOT NULL, dl char(128) DEFAULT '' NOT NULL,
type enum ('function','aggregate') NOT NULL, type enum ('function','aggregate') NOT NULL,

12
scripts/mysql_fix_privilege_tables.sql
View File

@ -7,7 +7,7 @@
-- On unix, you should use the mysql_fix_privilege_tables script to execute -- On unix, you should use the mysql_fix_privilege_tables script to execute
-- this sql script. -- this sql script.
-- On windows you should do 'mysql --force < mysql_fix_privilege_tables.sql' -- On windows you should do 'mysql --force mysql < mysql_fix_privilege_tables.sql'
USE mysql; USE mysql;
ALTER TABLE user type=MyISAM; ALTER TABLE user type=MyISAM;
@ -19,7 +19,7 @@ ALTER TABLE tables_priv type=MyISAM;
ALTER TABLE user change Password Password char(41) not null; ALTER TABLE user change Password Password char(41) not null;
ALTER TABLE user add File_priv enum('N','Y') NOT NULL; ALTER TABLE user add File_priv enum('N','Y') NOT NULL;
CREATE TABLE IF NOT EXISTS func ( CREATE TABLE IF NOT EXISTS func (
name char(64) DEFAULT '' NOT NULL, name char(64) binary DEFAULT '' NOT NULL,
ret tinyint(1) DEFAULT '0' NOT NULL, ret tinyint(1) DEFAULT '0' NOT NULL,
dl char(128) DEFAULT '' NOT NULL, dl char(128) DEFAULT '' NOT NULL,
type enum ('function','aggregate') NOT NULL, type enum ('function','aggregate') NOT NULL,
@ -56,10 +56,10 @@ ALTER TABLE user MODIFY ssl_type enum('','ANY','X509', 'SPECIFIED') NOT NULL;
-- --
CREATE TABLE IF NOT EXISTS tables_priv ( CREATE TABLE IF NOT EXISTS tables_priv (
Host char(60) DEFAULT '' NOT NULL, Host char(60) binary DEFAULT '' NOT NULL,
Db char(60) DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL,
User char(16) DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL,
Table_name char(60) DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL,
Grantor char(77) DEFAULT '' NOT NULL, Grantor char(77) DEFAULT '' NOT NULL,
Timestamp timestamp(14), Timestamp timestamp(14),
Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') DEFAULT '' NOT NULL, Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') DEFAULT '' NOT NULL,