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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
402d7129
Commit
402d7129
authored
Apr 23, 2007
by
msvensson@pilot.blaudden
Browse files
Options
Browse Files
Download
Plain Diff
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
parents
b941ef86
1561c39c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
23 deletions
+25
-23
scripts/CMakeLists.txt
scripts/CMakeLists.txt
+1
-0
scripts/Makefile.am
scripts/Makefile.am
+18
-14
scripts/comp_sql.c
scripts/comp_sql.c
+6
-9
No files found.
scripts/CMakeLists.txt
View file @
402d7129
...
@@ -22,6 +22,7 @@ GET_TARGET_PROPERTY(COMP_SQL_EXE comp_sql LOCATION)
...
@@ -22,6 +22,7 @@ GET_TARGET_PROPERTY(COMP_SQL_EXE comp_sql LOCATION)
ADD_CUSTOM_COMMAND
(
OUTPUT
${
PROJECT_SOURCE_DIR
}
/scripts/mysql_fix_privilege_tables_sql.c
ADD_CUSTOM_COMMAND
(
OUTPUT
${
PROJECT_SOURCE_DIR
}
/scripts/mysql_fix_privilege_tables_sql.c
COMMAND
${
COMP_SQL_EXE
}
COMMAND
${
COMP_SQL_EXE
}
mysql_fix_privilege_tables
mysql_fix_privilege_tables.sql
mysql_fix_privilege_tables.sql
mysql_fix_privilege_tables_sql.c
mysql_fix_privilege_tables_sql.c
DEPENDS comp_sql
${
PROJECT_SOURCE_DIR
}
/scripts/mysql_fix_privilege_tables.sql
)
DEPENDS comp_sql
${
PROJECT_SOURCE_DIR
}
/scripts/mysql_fix_privilege_tables.sql
)
...
...
scripts/Makefile.am
View file @
402d7129
...
@@ -15,6 +15,11 @@
...
@@ -15,6 +15,11 @@
## Process this file with automake to create Makefile.in
## Process this file with automake to create Makefile.in
BUILT_SOURCES
=
mysql_fix_privilege_tables.sql
\
mysql_fix_privilege_tables_sql.c
noinst_PROGRAMS
=
comp_sql
bin_SCRIPTS
=
@server_scripts@
\
bin_SCRIPTS
=
@server_scripts@
\
msql2mysql
\
msql2mysql
\
mysql_config
\
mysql_config
\
...
@@ -83,7 +88,8 @@ CLEANFILES = @server_scripts@ \
...
@@ -83,7 +88,8 @@ CLEANFILES = @server_scripts@ \
mysqldumpslow
\
mysqldumpslow
\
mysql_tableinfo
\
mysql_tableinfo
\
mysqld_multi
\
mysqld_multi
\
mysql_fix_privilege_tables.sql
mysql_fix_privilege_tables.sql
\
mysql_fix_privilege_tables_sql.c
# mysqlbug should be distributed built so that people can report build
# mysqlbug should be distributed built so that people can report build
# failures with it.
# failures with it.
...
@@ -100,6 +106,17 @@ mysql_fix_privilege_tables.sql: mysql_system_tables.sql \
...
@@ -100,6 +106,17 @@ mysql_fix_privilege_tables.sql: mysql_system_tables.sql \
@
echo
"Building
$@
"
;
@
echo
"Building
$@
"
;
@
cat
mysql_system_tables.sql mysql_system_tables_fix.sql
>
$@
@
cat
mysql_system_tables.sql mysql_system_tables_fix.sql
>
$@
#
# Build mysql_fix_privilege_tables_sql.c from
# mysql_fix_privileges_tables.sql using comp_sql
#
mysql_fix_privilege_tables_sql.c
:
comp_sql.c mysql_fix_privilege_tables.sql
$(MAKE)
$(AM_MAKEFLAGS)
comp_sql
$(EXEEXT)
$(top_builddir)
/scripts/comp_sql
$(EXEEXT)
\
mysql_fix_privilege_tables
\
$(top_srcdir)
/scripts/mysql_fix_privilege_tables.sql
$@
SUFFIXES
=
.sh
SUFFIXES
=
.sh
.sh
:
.sh
:
...
@@ -156,18 +173,5 @@ SUFFIXES = .sh
...
@@ -156,18 +173,5 @@ SUFFIXES = .sh
@
MV@
$@
-t
$@
@
MV@
$@
-t
$@
BUILT_SOURCES
=
mysql_fix_privilege_tables_sql.c
noinst_PROGRAMS
=
comp_sql
#
# Build mysql_fix_privilege_tables_sql.c from
# mysql_fix_privileges_tables.sql using comp_sql
#
mysql_fix_privilege_tables_sql.c
:
comp_sql.c mysql_fix_privilege_tables.sql
$(MAKE)
$(AM_MAKEFLAGS)
comp_sql
$(EXEEXT)
$(top_builddir)
/scripts/comp_sql
$(EXEEXT)
\
mysql_fix_privilege_tables.sql
$@
# Don't update the files from bitkeeper
# Don't update the files from bitkeeper
%
::
SCCS/s.%
%
::
SCCS/s.%
scripts/comp_sql.c
View file @
402d7129
...
@@ -58,12 +58,12 @@ static void die(const char *fmt, ...)
...
@@ -58,12 +58,12 @@ static void die(const char *fmt, ...)
int
main
(
int
argc
,
char
*
argv
[])
int
main
(
int
argc
,
char
*
argv
[])
{
{
char
buff
[
512
];
char
buff
[
512
];
char
*
infile
_name
=
argv
[
1
];
char
*
struct
_name
=
argv
[
1
];
char
*
out
file_name
=
argv
[
2
];
char
*
in
file_name
=
argv
[
2
];
char
*
end
=
infile_name
;
char
*
outfile_name
=
argv
[
3
]
;
if
(
argc
!=
3
)
if
(
argc
!=
4
)
die
(
"Usage: comp_sql <sql_filename> <c_filename>"
);
die
(
"Usage: comp_sql <s
truct_name> <s
ql_filename> <c_filename>"
);
/* Open input and output file */
/* Open input and output file */
if
(
!
(
in
=
fopen
(
infile_name
,
"r"
)))
if
(
!
(
in
=
fopen
(
infile_name
,
"r"
)))
...
@@ -71,10 +71,7 @@ int main(int argc, char *argv[])
...
@@ -71,10 +71,7 @@ int main(int argc, char *argv[])
if
(
!
(
out
=
fopen
(
outfile_name
,
"w"
)))
if
(
!
(
out
=
fopen
(
outfile_name
,
"w"
)))
die
(
"Failed to open output file '%s'"
,
outfile_name
);
die
(
"Failed to open output file '%s'"
,
outfile_name
);
while
(
*
end
&&
*
end
!=
'.'
)
fprintf
(
out
,
"const char* %s={
\n\"
"
,
struct_name
);
end
++
;
*
end
=
0
;
fprintf
(
out
,
"const char* %s={
\n\"
"
,
infile_name
);
while
(
fgets
(
buff
,
sizeof
(
buff
),
in
))
while
(
fgets
(
buff
,
sizeof
(
buff
),
in
))
{
{
...
...
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