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
b5ca7236
Commit
b5ca7236
authored
Apr 03, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge
scripts/mysql_install_db.sh: Auto merged
parents
a6871e27
2574445e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
7 deletions
+9
-7
Docs/MySQLEULA.txt
Docs/MySQLEULA.txt
+1
-1
mysql-test/Makefile.am
mysql-test/Makefile.am
+5
-4
netware/mysql_install_db.c
netware/mysql_install_db.c
+1
-1
scripts/mysql_install_db.sh
scripts/mysql_install_db.sh
+2
-1
No files found.
Docs/MySQLEULA.txt
View file @
b5ca7236
...
@@ -63,7 +63,7 @@ Licensee.
...
@@ -63,7 +63,7 @@ Licensee.
4. Price and payment.
4. Price and payment.
No later than thirty (30) days after submission of the Order Form, Licensee
No later than thirty (30) days after submission of the Order Form, Licensee
shall remit one non-refundable license fee per Licensed Copy as posted on
shall remit one non-refundable license fee per Licensed Copy as posted on
http://
order
.mysql.com on the date Licensee submitted the Order Form (the
http://
shop
.mysql.com on the date Licensee submitted the Order Form (the
"License Fee"). All payments shall be made in Euros or U.S. dollars. Licensee
"License Fee"). All payments shall be made in Euros or U.S. dollars. Licensee
shall be responsible for paying all local, state, federal and international
shall be responsible for paying all local, state, federal and international
sales, value added, excise and other taxes and duties payable in connection
sales, value added, excise and other taxes and duties payable in connection
...
...
mysql-test/Makefile.am
View file @
b5ca7236
...
@@ -32,13 +32,14 @@ endif
...
@@ -32,13 +32,14 @@ endif
benchdir_root
=
$(prefix)
benchdir_root
=
$(prefix)
testdir
=
$(benchdir_root)
/mysql-test
testdir
=
$(benchdir_root)
/mysql-test
EXTRA_SCRIPTS
=
mysql-test-run.sh install_test_db.sh valgrind.supp
EXTRA_SCRIPTS
=
mysql-test-run.sh install_test_db.sh valgrind.supp
$(PRESCRIPTS)
EXTRA_DIST
=
$(EXTRA_SCRIPTS)
EXTRA_DIST
=
$(EXTRA_SCRIPTS)
dist_bin_SCRIPTS
=
mysql-test-run.pl
GENSCRIPTS
=
mysql-test-run install_test_db
test_SCRIPTS
=
mysql-test-run install_test_db
PRESCRIPTS
=
mysql-test-run.pl
test_SCRIPTS
=
$(GENSCRIPTS)
$(PRESCRIPTS)
test_DATA
=
std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem
\
test_DATA
=
std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem
\
std_data/server-cert.pem std_data/server-key.pem
std_data/server-cert.pem std_data/server-key.pem
CLEANFILES
=
$(
test_
SCRIPTS)
$(test_DATA)
CLEANFILES
=
$(
GEN
SCRIPTS)
$(test_DATA)
INCLUDES
=
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
-I
..
INCLUDES
=
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
-I
..
EXTRA_PROGRAMS
=
mysql_test_run_new
EXTRA_PROGRAMS
=
mysql_test_run_new
...
...
netware/mysql_install_db.c
View file @
b5ca7236
...
@@ -423,7 +423,7 @@ int main(int argc, char **argv)
...
@@ -423,7 +423,7 @@ int main(int argc, char **argv)
printf
(
"
\n
The latest information about MySQL is available on the web at
\n
"
);
printf
(
"
\n
The latest information about MySQL is available on the web at
\n
"
);
printf
(
"
\t
http://www.mysql.com
\n
"
);
printf
(
"
\t
http://www.mysql.com
\n
"
);
printf
(
"
\n
Support MySQL by buying support at http
s://order
.mysql.com
\n\n
"
);
printf
(
"
\n
Support MySQL by buying support at http
://shop
.mysql.com
\n\n
"
);
return
0
;
return
0
;
}
}
scripts/mysql_install_db.sh
View file @
b5ca7236
#!/bin/sh
#!/bin/sh
# Copyright (C) 2002-2003 MySQL AB
# Copyright (C) 2002-2003 MySQL AB
# For a more info consult the file COPYRIGHT distributed with this file.
# For a more info consult the file COPYRIGHT distributed with this file.
...
@@ -269,7 +270,7 @@ then
...
@@ -269,7 +270,7 @@ then
echo
echo
echo
"The latest information about MySQL is available on the web at"
echo
"The latest information about MySQL is available on the web at"
echo
"http://www.mysql.com"
echo
"http://www.mysql.com"
echo
"Support MySQL by buying support/licenses at http
s://order
.mysql.com"
echo
"Support MySQL by buying support/licenses at http
://shop
.mysql.com"
fi
fi
exit
0
exit
0
else
else
...
...
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