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
33591457
Commit
33591457
authored
17 years ago
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-new-maint
parents
9aeb8297
bcb7521b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
12 deletions
+14
-12
mysql-test/t/mysqldump.test
mysql-test/t/mysqldump.test
+14
-12
No files found.
mysql-test/t/mysqldump.test
View file @
33591457
...
...
@@ -126,13 +126,13 @@ drop table t1;
create
table
t1
(
a
int
);
insert
into
t1
values
(
1
),(
2
),(
3
);
--
exec
$MYSQL_DUMP
--
skip
-
comments
--
tab
=
$MYSQLTEST_VARDIR
/
tmp
/
test
--
exec
cat
$MYSQLTEST_VARDIR
/
tmp
/
t1
.
sql
--
exec
cat
$MYSQLTEST_VARDIR
/
tmp
/
t1
.
txt
--
exec
rm
$MYSQLTEST_VARDIR
/
tmp
/
t1
.
sql
--
exec
rm
$MYSQLTEST_VARDIR
/
tmp
/
t1
.
txt
--
cat_file
$MYSQLTEST_VARDIR
/
tmp
/
t1
.
sql
--
cat_file
$MYSQLTEST_VARDIR
/
tmp
/
t1
.
txt
--
remove_file
$MYSQLTEST_VARDIR
/
tmp
/
t1
.
sql
--
remove_file
$MYSQLTEST_VARDIR
/
tmp
/
t1
.
txt
--
exec
$MYSQL_DUMP
--
tab
=
$MYSQLTEST_VARDIR
/
tmp
/
test
--
exec
rm
$MYSQLTEST_VARDIR
/
tmp
/
t1
.
sql
--
exec
rm
$MYSQLTEST_VARDIR
/
tmp
/
t1
.
txt
--
remove_file
$MYSQLTEST_VARDIR
/
tmp
/
t1
.
sql
--
remove_file
$MYSQLTEST_VARDIR
/
tmp
/
t1
.
txt
drop
table
t1
;
--
echo
#
...
...
@@ -710,7 +710,7 @@ drop table t1, t2, t3;
create
table
t1
(
a
int
);
--
error
2
--
exec
$MYSQL_DUMP
--
skip
-
comments
--
force
test
t1
--
where
=
'xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
2
>&
1
--
exec
$MYSQL_DUMP
--
skip
-
comments
--
force
test
t1
--
where
=
"xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
2
>&
1
drop
table
t1
;
--
echo
#
...
...
@@ -913,11 +913,13 @@ DROP TABLE t1, t2;
--
echo
# Bugs #9136, #12917: problems with --defaults-extra-file option
--
echo
#
--
system
echo
'[mysqltest1]'
>
$MYSQLTEST_VARDIR
/
tmp
/
tmp
.
cnf
--
system
echo
'port=1234'
>>
$MYSQLTEST_VARDIR
/
tmp
/
tmp
.
cnf
--
write_file
$MYSQLTEST_VARDIR
/
tmp
/
tmp
.
cnf
[
mysqltest1
]
port
=
1234
EOF
--
exec
$MYSQL_MY_PRINT_DEFAULTS
-
c
$MYSQLTEST_VARDIR
/
tmp
/
tmp
.
cnf
mysqltest1
--
exec
$MYSQL_MY_PRINT_DEFAULTS
-
e
$MYSQLTEST_VARDIR
/
tmp
/
tmp
.
cnf
mysqltest1
mysqltest1
--
system
rm
$MYSQLTEST_VARDIR
/
tmp
/
tmp
.
cnf
--
remov_file
$MYSQLTEST_VARDIR
/
tmp
/
tmp
.
cnf
--
echo
#
--
echo
# Test of fix to BUG 12597
...
...
@@ -1190,9 +1192,9 @@ create view v1 as select qty, price, qty*price as value from t;
create
view
v2
as
select
qty
from
v1
;
--
echo
mysqldump
{
--
exec
$MYSQL_DUMP
--
compact
-
F
--
tab
$MYSQLTEST_VARDIR
/
tmp
test
--
exec
cat
$MYSQLTEST_VARDIR
/
tmp
/
v1
.
sql
--
cat_file
$MYSQLTEST_VARDIR
/
tmp
/
v1
.
sql
--
echo
}
mysqldump
{
--
exec
cat
$MYSQLTEST_VARDIR
/
tmp
/
v2
.
sql
--
cat_file
$MYSQLTEST_VARDIR
/
tmp
/
v2
.
sql
--
echo
}
mysqldump
drop
view
v1
;
drop
view
v2
;
...
...
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