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
4edd0f3a
Commit
4edd0f3a
authored
20 years ago
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents
44926664
77a58fb7
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
11 deletions
+20
-11
mysql-test/t/ndb_autodiscover.test
mysql-test/t/ndb_autodiscover.test
+7
-7
strings/uca-dump.c
strings/uca-dump.c
+13
-4
No files found.
mysql-test/t/ndb_autodiscover.test
View file @
4edd0f3a
...
...
@@ -199,7 +199,7 @@ insert into t4 values (1, "Automatic");
select
*
from
t4
;
# Remove the table from NDB
system
exec
$NDB_TOOLS_DIR
/
ndb_drop_table
-
d
test
t4
>
/
dev
/
null
;
system
exec
$NDB_TOOLS_DIR
/
ndb_drop_table
-
-
no
-
defaults
-
d
test
t4
>
/
dev
/
null
;
#
# Test that correct error is returned
...
...
@@ -230,7 +230,7 @@ select * from t4;
flush
tables
;
# Remove the table from NDB
system
exec
$NDB_TOOLS_DIR
/
ndb_drop_table
-
d
test
t4
>
/
dev
/
null
;
system
exec
$NDB_TOOLS_DIR
/
ndb_drop_table
-
-
no
-
defaults
-
d
test
t4
>
/
dev
/
null
;
SHOW
TABLES
;
...
...
@@ -264,8 +264,8 @@ insert into t8 values (8, "myisam table 8");
insert
into
t9
values
(
9
);
# Remove t3, t5 from NDB
system
exec
$NDB_TOOLS_DIR
/
ndb_drop_table
-
d
test
t3
>
/
dev
/
null
;
system
exec
$NDB_TOOLS_DIR
/
ndb_drop_table
-
d
test
t5
>
/
dev
/
null
;
system
exec
$NDB_TOOLS_DIR
/
ndb_drop_table
-
-
no
-
defaults
-
d
test
t3
>
/
dev
/
null
;
system
exec
$NDB_TOOLS_DIR
/
ndb_drop_table
-
-
no
-
defaults
-
d
test
t5
>
/
dev
/
null
;
# Remove t6, t7 from disk
system
rm
var
/
master
-
data
/
test
/
t6
.
frm
>
/
dev
/
null
;
system
rm
var
/
master
-
data
/
test
/
t7
.
frm
>
/
dev
/
null
;
...
...
@@ -306,8 +306,8 @@ insert into t8 values (8, "myisam table 8");
insert
into
t9
values
(
9
);
# Remove t3, t5 from NDB
system
exec
$NDB_TOOLS_DIR
/
ndb_drop_table
-
d
test
t3
>
/
dev
/
null
;
system
exec
$NDB_TOOLS_DIR
/
ndb_drop_table
-
d
test
t5
>
/
dev
/
null
;
system
exec
$NDB_TOOLS_DIR
/
ndb_drop_table
-
-
no
-
defaults
-
d
test
t3
>
/
dev
/
null
;
system
exec
$NDB_TOOLS_DIR
/
ndb_drop_table
-
-
no
-
defaults
-
d
test
t5
>
/
dev
/
null
;
# Remove t6, t7 from disk
system
rm
var
/
master
-
data
/
test
/
t6
.
frm
>
/
dev
/
null
;
system
rm
var
/
master
-
data
/
test
/
t7
.
frm
>
/
dev
/
null
;
...
...
@@ -479,4 +479,4 @@ create table t10 (
insert
into
t10
values
(
1
,
'kalle'
);
--
exec
$NDB_TOOLS_DIR
/
ndb_drop_table
-
d
test
`$NDB_TOOLS_DIR/ndb_show_table
s | grep BLOB`
>
/
dev
/
null
2
>&
1
||
true
--
exec
$NDB_TOOLS_DIR
/
ndb_drop_table
-
-
no
-
defaults
-
d
test
`$NDB_TOOLS_DIR/ndb_show_tables --no-default
s | grep BLOB`
>
/
dev
/
null
2
>&
1
||
true
This diff is collapsed.
Click to expand it.
strings/uca-dump.c
View file @
4edd0f3a
...
...
@@ -218,7 +218,6 @@ int main(int ac, char **av)
*/
if
(
ndefs
==
MY_UCA_NCHARS
)
{
printf
(
"/* Don't dump w=%d pg=%3X: ndefs=%d */
\n
"
,
w
,
page
,
ndefs
);
continue
;
}
switch
(
maxnum
)
...
...
@@ -263,7 +262,17 @@ int main(int ac, char **av)
for
(
i
=
0
;
i
<
maxnum
;
i
++
)
{
printf
(
"0x%04X"
,(
int
)
weight
[
i
]);
/*
Invert weights for secondary level to
sort upper case letters before their
lower case counter part.
*/
int
tmp
=
weight
[
i
];
if
(
w
==
2
&&
tmp
)
tmp
=
(
int
)(
0x100
-
weight
[
i
]);
printf
(
"0x%04X"
,
tmp
);
if
((
offs
+
1
!=
MY_UCA_NCHARS
)
||
(
i
+
1
!=
maxnum
))
printf
(
","
);
nchars
++
;
...
...
@@ -281,7 +290,7 @@ int main(int ac, char **av)
printf
(
"};
\n\n
"
);
}
printf
(
"uchar uca
l
%s[%d]={
\n
"
,
pname
[
w
],
MY_UCA_NPAGES
);
printf
(
"uchar uca
_length
%s[%d]={
\n
"
,
pname
[
w
],
MY_UCA_NPAGES
);
for
(
page
=
0
;
page
<
MY_UCA_NPAGES
;
page
++
)
{
printf
(
"%d%s%s"
,
pagemaxlen
[
page
],
page
<
MY_UCA_NPAGES
-
1
?
","
:
""
,(
page
+
1
)
%
16
?
""
:
"
\n
"
);
...
...
@@ -289,7 +298,7 @@ int main(int ac, char **av)
printf
(
"};
\n
"
);
printf
(
"uint16 *uca
w
%s[%d]={
\n
"
,
pname
[
w
],
MY_UCA_NPAGES
);
printf
(
"uint16 *uca
_weight
%s[%d]={
\n
"
,
pname
[
w
],
MY_UCA_NPAGES
);
for
(
page
=
0
;
page
<
MY_UCA_NPAGES
;
page
++
)
{
const
char
*
comma
=
page
<
MY_UCA_NPAGES
-
1
?
","
:
""
;
...
...
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