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
f6116f85
Commit
f6116f85
authored
Dec 08, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
parents
51ea3b04
1b1de340
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
6 deletions
+16
-6
client/mysqltest.c
client/mysqltest.c
+10
-6
mysql-test/t/system_mysql_db_fix.test
mysql-test/t/system_mysql_db_fix.test
+6
-0
No files found.
client/mysqltest.c
View file @
f6116f85
...
...
@@ -540,7 +540,6 @@ static void free_used_memory()
mysql_server_end
();
if
(
ps_protocol
)
ps_free_reg
();
my_end
(
MY_CHECK_ERROR
);
DBUG_VOID_RETURN
;
}
...
...
@@ -558,6 +557,7 @@ static void die(const char* fmt, ...)
}
va_end
(
args
);
free_used_memory
();
my_end
(
MY_CHECK_ERROR
);
exit
(
1
);
}
...
...
@@ -570,6 +570,7 @@ static void abort_not_supported_test()
if
(
!
silent
)
printf
(
"skipped
\n
"
);
free_used_memory
();
my_end
(
MY_CHECK_ERROR
);
exit
(
2
);
}
...
...
@@ -668,6 +669,7 @@ static int check_result(DYNAMIC_STRING* ds, const char* fname,
{
int
error
=
0
;
int
res
=
dyn_string_cmp
(
ds
,
fname
);
DBUG_ENTER
(
"check_result"
);
if
(
res
&&
require_option
)
abort_not_supported_test
();
...
...
@@ -687,7 +689,7 @@ static int check_result(DYNAMIC_STRING* ds, const char* fname,
}
if
(
error
)
reject_dump
(
fname
,
ds
->
str
,
ds
->
length
);
return
error
;
DBUG_RETURN
(
error
)
;
}
...
...
@@ -1841,7 +1843,10 @@ int read_line(char* buf, int size)
cur_file
--
;
lineno
--
;
if
(
cur_file
==
file_stack
)
{
DBUG_PRINT
(
"info"
,
(
"end of file"
));
DBUG_RETURN
(
1
);
}
continue
;
}
...
...
@@ -2011,7 +2016,6 @@ int read_query(struct st_query** q_ptr)
q
->
query_buf
=
q
->
query
=
0
;
if
(
read_line
(
read_query_buf
,
sizeof
(
read_query_buf
)))
{
DBUG_PRINT
(
"warning"
,(
"too long query"
));
DBUG_RETURN
(
1
);
}
DBUG_PRINT
(
"info"
,
(
"query: %s"
,
read_query_buf
));
...
...
@@ -3366,8 +3370,6 @@ int main(int argc, char **argv)
my_bool
require_file
=
0
,
q_send_flag
=
0
,
abort_flag
=
0
;
char
save_file
[
FN_REFLEN
];
MY_INIT
(
argv
[
0
]);
{
DBUG_ENTER
(
"main"
);
/* Use all time until exit if no explicit 'start_timer' */
timer_start
=
timer_now
();
...
...
@@ -3394,6 +3396,8 @@ int main(int argc, char **argv)
*
block_ok
=
1
;
init_dynamic_string
(
&
ds_res
,
""
,
0
,
65536
);
parse_args
(
argc
,
argv
);
DBUG_PRINT
(
"info"
,(
"result_file: '%s'"
,
result_file
?
result_file
:
""
));
if
(
mysql_server_init
(
embedded_server_arg_count
,
embedded_server_args
,
(
char
**
)
embedded_server_groups
))
...
...
@@ -3659,9 +3663,9 @@ int main(int argc, char **argv)
if
(
!
got_end_timer
)
timer_output
();
/* No end_timer cmd, end it */
free_used_memory
();
my_end
(
MY_CHECK_ERROR
);
exit
(
error
?
1
:
0
);
return
error
?
1
:
0
;
/* Keep compiler happy */
}
}
...
...
mysql-test/t/system_mysql_db_fix.test
View file @
f6116f85
...
...
@@ -9,6 +9,7 @@ use test;
# create system tables as in mysql-3.20
--
disable_warnings
CREATE
TABLE
db
(
Host
char
(
60
)
binary
DEFAULT
''
NOT
NULL
,
Db
char
(
32
)
binary
DEFAULT
''
NOT
NULL
,
...
...
@@ -23,10 +24,12 @@ CREATE TABLE db (
KEY
User
(
User
)
)
type
=
ISAM
;
--
enable
-
warnings
INSERT
INTO
db
VALUES
(
'%'
,
'test'
,
''
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
);
INSERT
INTO
db
VALUES
(
'%'
,
'test\_%'
,
''
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
);
--
disable_warnings
CREATE
TABLE
host
(
Host
char
(
60
)
binary
DEFAULT
''
NOT
NULL
,
Db
char
(
32
)
binary
DEFAULT
''
NOT
NULL
,
...
...
@@ -39,7 +42,9 @@ CREATE TABLE host (
PRIMARY
KEY
Host
(
Host
,
Db
)
)
type
=
ISAM
;
--
enable
-
warnings
--
disable_warnings
CREATE
TABLE
user
(
Host
char
(
60
)
binary
DEFAULT
''
NOT
NULL
,
User
char
(
16
)
binary
DEFAULT
''
NOT
NULL
,
...
...
@@ -56,6 +61,7 @@ CREATE TABLE user (
PRIMARY
KEY
Host
(
Host
,
User
)
)
type
=
ISAM
;
--
enable
-
warnings
INSERT
INTO
user
VALUES
(
'localhost'
,
'root'
,
''
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
,
'Y'
);
INSERT
INTO
user
VALUES
(
'localhost'
,
''
,
''
,
'N'
,
'N'
,
'N'
,
'N'
,
'N'
,
'N'
,
'N'
,
'N'
,
'N'
);
...
...
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