Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
a0507f98
Commit
a0507f98
authored
19 years ago
by
wax@kishkin.ru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge
parent
dca227ba
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
308 additions
and
148 deletions
+308
-148
mysql-test/my_create_tables.c
mysql-test/my_create_tables.c
+46
-19
mysql-test/my_manage.c
mysql-test/my_manage.c
+7
-4
mysql-test/mysql_test_run_new.c
mysql-test/mysql_test_run_new.c
+254
-124
mysql-test/t/ps_1general.test
mysql-test/t/ps_1general.test
+1
-1
No files found.
mysql-test/my_create_tables.c
View file @
a0507f98
...
...
@@ -96,6 +96,8 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
"Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
"PRIMARY KEY Host (Host,Db,User),"
"KEY User (User))"
"engine=MyISAM "
"CHARACTER SET utf8 COLLATE utf8_bin "
"comment='Database privileges';
\n
"
);
if
(
test
)
...
...
@@ -126,10 +128,12 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
"Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
"Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
"PRIMARY KEY Host (Host,Db))"
"comment='Host privileges;"
" Merged with database privileges';
\n
"
);
"engine=MyISAM "
"CHARACTER SET utf8 COLLATE utf8_bin "
"comment='Host privileges; Merged with database privileges';
\n
"
);
}
if
(
test_sys_file
(
mdata
,
"mysql/user.frm"
))
{
#ifdef __WIN__
...
...
@@ -184,7 +188,10 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
"max_updates int(11) unsigned DEFAULT 0 NOT NULL,"
"max_connections int(11) unsigned DEFAULT 0 NOT NULL,"
"PRIMARY KEY Host (Host,User)"
") comment='Users and global privileges';
\n
"
);
") engine=MyISAM "
"CHARACTER SET utf8 COLLATE utf8_bin "
"comment='Users and global privileges';
\n
"
);
if
(
test
)
{
...
...
@@ -238,7 +245,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
"dl char(128) DEFAULT '' NOT NULL,"
"type enum ('function','aggregate') NOT NULL,"
"PRIMARY KEY (name)"
") comment='User defined functions';
\n
"
);
") engine=MyISAM "
"CHARACTER SET utf8 COLLATE utf8_bin "
"comment='User defined functions';
\n
"
);
}
if
(
test_sys_file
(
mdata
,
"mysql/tables_priv.frm"
))
...
...
@@ -258,7 +267,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
" DEFAULT '' NOT NULL,"
"PRIMARY KEY (Host,Db,User,Table_name),"
"KEY Grantor (Grantor)"
") comment='Table privileges';
\n
"
);
") engine=MyISAM "
"CHARACTER SET utf8 COLLATE utf8_bin "
"comment='Table privileges';
\n
"
);
}
if
(
test_sys_file
(
mdata
,
"mysql/columns_priv.frm"
))
...
...
@@ -274,7 +285,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
"Column_priv set('Select','Insert','Update','References')"
" DEFAULT '' NOT NULL,"
"PRIMARY KEY (Host,Db,User,Table_name,Column_name)"
") comment='Column privileges';
\n
"
);
") engine=MyISAM "
"CHARACTER SET utf8 COLLATE utf8_bin "
"comment='Column privileges';
\n
"
);
}
if
(
test_sys_file
(
mdata
,
"mysql/help_topic.frm"
))
...
...
@@ -289,7 +302,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
"url varchar(128) not null,"
"primary key (help_topic_id),"
"unique index (name)"
") comment='help topics';
\n
"
);
") engine=MyISAM "
"CHARACTER SET utf8 "
"comment='help topics';
\n
"
);
}
if
(
test_sys_file
(
mdata
,
"mysql/help_category.frm"
))
...
...
@@ -302,7 +317,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
"url varchar(128) not null,"
"primary key (help_category_id),"
"unique index (name)"
") comment='help categories';
\n
"
);
") engine=MyISAM "
"CHARACTER SET utf8 "
"comment='help categories';
\n
"
);
}
if
(
test_sys_file
(
mdata
,
"mysql/help_keyword.frm"
))
...
...
@@ -313,7 +330,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
"name varchar(64) not null,"
"primary key (help_keyword_id),"
"unique index (name)"
") comment='help keywords';
\n
"
);
") engine=MyISAM "
"CHARACTER SET utf8 "
"comment='help keywords';
\n
"
);
}
if
(
test_sys_file
(
mdata
,
"mysql/help_relation.frm"
))
...
...
@@ -323,7 +342,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
"help_topic_id int unsigned not null references help_topic,"
"help_keyword_id int unsigned not null references help_keyword,"
"primary key (help_keyword_id, help_topic_id)"
") comment='keyword-topic relation';
\n
"
);
") engine=MyISAM "
"CHARACTER SET utf8 "
"comment='keyword-topic relation';
\n
"
);
}
if
(
test_sys_file
(
mdata
,
"mysql/time_zone_name.frm"
))
...
...
@@ -333,7 +354,7 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
"Name char(64) NOT NULL,"
"Time_zone_id int unsigned NOT NULL,"
"PRIMARY KEY Name (Name)"
")
DEFAULT CHARACTER SET latin1
"
")
engine=MyISAM CHARACTER SET utf8
"
"comment='Time zone names';
\n
"
);
if
(
test
)
...
...
@@ -341,7 +362,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
fprintf
(
out
,
"INSERT INTO time_zone_name (Name, Time_Zone_id) VALUES"
"('MET', 1), ('UTC', 2), ('Universal', 2), "
"('Europe/Moscow',3), ('leap/Europe/Moscow',4);
\n
"
);
"('Europe/Moscow',3), ('leap/Europe/Moscow',4),"
"('Japan', 5);
\n
"
);
}
}
...
...
@@ -353,13 +376,13 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
"Time_zone_id int unsigned NOT NULL auto_increment,"
"Use_leap_seconds enum('Y','N') DEFAULT 'N' NOT NULL,"
"PRIMARY KEY TzId (Time_zone_id)"
")
DEFAULT CHARACTER SET latin1
"
")
engine=MyISAM CHARACTER SET utf8
"
"comment='Time zones';
\n
"
);
if
(
test
)
{
fprintf
(
out
,
"INSERT INTO time_zone (Time_zone_id, Use_leap_seconds)"
"VALUES (1,'N'), (2,'N'), (3,'N'), (4,'Y');
\n
"
);
"VALUES (1,'N'), (2,'N'), (3,'N'), (4,'Y')
, (5,'N')
;
\n
"
);
}
}
...
...
@@ -371,7 +394,7 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
"Transition_time bigint signed NOT NULL,"
"Transition_type_id int unsigned NOT NULL,"
"PRIMARY KEY TzIdTranTime (Time_zone_id, Transition_time)"
")
DEFAULT CHARACTER SET latin1
"
")
engine=MyISAM CHARACTER SET utf8
"
"comment='Time zone transitions';
\n
"
);
if
(
test
)
...
...
@@ -576,7 +599,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
",(4, 2045689222, 8) ,(4, 2058390022, 9)"
",(4, 2077138822, 8) ,(4, 2090444422, 9)"
",(4, 2108588422, 8) ,(4, 2121894022, 9)"
",(4, 2140038022, 8);
\n
"
);
",(4, 2140038022, 8), (5, -1009875600, 1);
\n
"
);
}
}
...
...
@@ -590,7 +615,7 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
"Is_DST tinyint unsigned DEFAULT 0 NOT NULL,"
"Abbreviation char(8) DEFAULT '' NOT NULL,"
"PRIMARY KEY TzIdTrTId (Time_zone_id, Transition_type_id)"
")
DEFAULT CHARACTER SET latin1
"
")
engine=MyISAM CHARACTER SET utf8
"
"comment='Time zone transition types';
\n
"
);
if
(
test
)
...
...
@@ -612,7 +637,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
",(4, 4, 10800, 0, 'MSK') ,(4, 5, 14400, 1, 'MSD')"
",(4, 6, 18000, 1, 'MSD') ,(4, 7, 7200, 0, 'EET')"
",(4, 8, 10800, 0, 'MSK') ,(4, 9, 14400, 1, 'MSD')"
",(4, 10, 10800, 1, 'EEST') ,(4, 11, 7200, 0, 'EET');
\n
"
);
",(4, 10, 10800, 1, 'EEST') ,(4, 11, 7200, 0, 'EET')"
",(5, 0, 32400, 0, 'CJT') ,(5, 1, 32400, 0, 'JST');
\n
"
);
}
}
...
...
@@ -623,7 +650,7 @@ bool create_system_files(const char *mdata,const char *output_file, bool test)
"Transition_time bigint signed NOT NULL,"
"Correction int signed NOT NULL,"
"PRIMARY KEY TranTime (Transition_time)"
")
DEFAULT CHARACTER SET latin1
"
")
engine=MyISAM CHARACTER SET utf8
"
"comment='Leap seconds information for time zones';
\n
"
);
if
(
test
)
...
...
This diff is collapsed.
Click to expand it.
mysql-test/my_manage.c
View file @
a0507f98
...
...
@@ -122,7 +122,7 @@ void add_arg(arg_list_t *al, const char *format, ...)
al
->
argv
[
al
->
argc
]
=
malloc
(
strlen
(
temp
)
+
1
);
ASSERT
(
al
->
argv
[
al
->
argc
]
!=
NULL
);
strcpy
(
al
->
argv
[
al
->
argc
],
temp
);
++
(
al
->
argc
);
}
else
...
...
@@ -644,7 +644,7 @@ void del_tree(char *dir)
if
(
lstat
(
entry
->
d_name
,
&
st
)
==
-
1
)
{
/* FIXME error */
return
;
return
;
}
if
(
S_ISDIR
(
st
.
st_mode
))
#else
...
...
@@ -800,9 +800,12 @@ int removef(const char *format, ...)
#ifndef STRUCT_DIRENT_HAS_D_TYPE
struct
stat
st
;
if
(
lstat
(
entry
->
d_name
,
&
st
)
==
-
1
)
/* create long name */
snprintf
(
temp
,
FN_REFLEN
,
"%s/%s"
,
path
,
entry
->
d_name
);
if
(
lstat
(
temp
,
&
st
)
==
-
1
)
{
return
1
;
return
1
;
/* Error couldn't lstat file */
}
if
(
!
S_ISDIR
(
st
.
st_mode
)
&&
!
fnmatch
(
p
,
entry
->
d_name
,
0
))
...
...
This diff is collapsed.
Click to expand it.
mysql-test/mysql_test_run_new.c
View file @
a0507f98
This diff is collapsed.
Click to expand it.
mysql-test/t/ps_1general.test
View file @
a0507f98
...
...
@@ -329,7 +329,7 @@ prepare stmt4 from ' show engine bdb logs ';
execute
stmt4
;
--
enable_result_log
prepare
stmt4
from
' show full processlist '
;
--
replace_column
1
number
6
time
--
replace_column
1
number
6
time
3
localhost
execute
stmt4
;
prepare
stmt4
from
' show grants for user '
;
--
error
1295
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment