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
63abeebb
Commit
63abeebb
authored
Jan 21, 2005
by
heikki@hundin.mysql.fi
Browse files
Options
Browse Files
Download
Plain Diff
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
parents
c1e5f61b
2f6e0864
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
mysql-test/r/ctype_mb.result
mysql-test/r/ctype_mb.result
+2
-2
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+4
-0
sql/sql_show.cc
sql/sql_show.cc
+2
-1
No files found.
mysql-test/r/ctype_mb.result
View file @
63abeebb
...
...
@@ -33,7 +33,7 @@ t1 CREATE TABLE `t1` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1
SHOW KEYS FROM t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t1 1 key_a 1 a A NULL
9
NULL YES BTREE
t1 1 key_a 1 a A NULL
3
NULL YES BTREE
ALTER TABLE t1 CHANGE a a CHAR(4);
SHOW CREATE TABLE t1;
Table Create Table
...
...
@@ -53,5 +53,5 @@ t1 CREATE TABLE `t1` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1
SHOW KEYS FROM t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t1 1 key_a 1 a A NULL
9
NULL YES BTREE
t1 1 key_a 1 a A NULL
3
NULL YES BTREE
DROP TABLE t1;
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
View file @
63abeebb
...
...
@@ -2976,6 +2976,8 @@ void Dbdih::execCOPY_FRAGREF(Signal* signal)
SystemError
*
const
sysErr
=
(
SystemError
*
)
&
signal
->
theData
[
0
];
sysErr
->
errorCode
=
SystemError
::
CopyFragRefError
;
sysErr
->
errorRef
=
reference
();
sysErr
->
data1
=
errorCode
;
sysErr
->
data2
=
0
;
sendSignal
(
cntrRef
,
GSN_SYSTEM_ERROR
,
signal
,
SystemError
::
SignalLength
,
JBB
);
return
;
...
...
@@ -4492,6 +4494,8 @@ void Dbdih::handleTakeOverNewMaster(Signal* signal, Uint32 takeOverPtrI)
SystemError
*
const
sysErr
=
(
SystemError
*
)
&
signal
->
theData
[
0
];
sysErr
->
errorCode
=
SystemError
::
CopyFragRefError
;
sysErr
->
errorRef
=
reference
();
sysErr
->
data1
=
0
;
sysErr
->
data2
=
__LINE__
;
sendSignal
(
cntrRef
,
GSN_SYSTEM_ERROR
,
signal
,
SystemError
::
SignalLength
,
JBB
);
}
...
...
sql/sql_show.cc
View file @
63abeebb
...
...
@@ -1025,7 +1025,8 @@ mysqld_show_keys(THD *thd, TABLE_LIST *table_list)
/* Check if we have a key part that only uses part of the field */
if
(
!
(
key_info
->
flags
&
HA_FULLTEXT
)
&&
(
!
key_part
->
field
||
key_part
->
length
!=
table
->
field
[
key_part
->
fieldnr
-
1
]
->
key_length
()))
protocol
->
store_tiny
((
longlong
)
key_part
->
length
);
protocol
->
store_tiny
((
longlong
)
key_part
->
length
/
key_part
->
field
->
charset
()
->
mbmaxlen
);
else
protocol
->
store_null
();
protocol
->
store_null
();
// No pack_information yet
...
...
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