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
6c9d30c7
Commit
6c9d30c7
authored
Sep 22, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/stewart/Documents/MySQL/4.1/main
parents
7ce3ffe1
2543c551
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
239 additions
and
4 deletions
+239
-4
mysql-test/r/ndb_alter_table.result
mysql-test/r/ndb_alter_table.result
+116
-0
mysql-test/t/ndb_alter_table.test
mysql-test/t/ndb_alter_table.test
+119
-0
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+4
-4
No files found.
mysql-test/r/ndb_alter_table.result
View file @
6c9d30c7
...
...
@@ -200,3 +200,119 @@ a
drop table t4;
show tables;
Tables_in_test
create table t1 (
ai bigint auto_increment,
c001 int(11) not null,
c002 int(11) not null,
c003 int(11) not null,
c004 int(11) not null,
c005 int(11) not null,
c006 int(11) not null,
c007 int(11) not null,
c008 int(11) not null,
c009 int(11) not null,
c010 int(11) not null,
c011 int(11) not null,
c012 int(11) not null,
c013 int(11) not null,
c014 int(11) not null,
c015 int(11) not null,
c016 int(11) not null,
c017 int(11) not null,
c018 int(11) not null,
c019 int(11) not null,
c020 int(11) not null,
c021 int(11) not null,
c022 int(11) not null,
c023 int(11) not null,
c024 int(11) not null,
c025 int(11) not null,
c026 int(11) not null,
c027 int(11) not null,
c028 int(11) not null,
c029 int(11) not null,
c030 int(11) not null,
c031 int(11) not null,
c032 int(11) not null,
c033 int(11) not null,
c034 int(11) not null,
c035 int(11) not null,
c036 int(11) not null,
c037 int(11) not null,
c038 int(11) not null,
c039 int(11) not null,
c040 int(11) not null,
c041 int(11) not null,
c042 int(11) not null,
c043 int(11) not null,
c044 int(11) not null,
c045 int(11) not null,
c046 int(11) not null,
c047 int(11) not null,
c048 int(11) not null,
c049 int(11) not null,
c050 int(11) not null,
c051 int(11) not null,
c052 int(11) not null,
c053 int(11) not null,
c054 int(11) not null,
c055 int(11) not null,
c056 int(11) not null,
c057 int(11) not null,
c058 int(11) not null,
c059 int(11) not null,
c060 int(11) not null,
c061 int(11) not null,
c062 int(11) not null,
c063 int(11) not null,
c064 int(11) not null,
c065 int(11) not null,
c066 int(11) not null,
c067 int(11) not null,
c068 int(11) not null,
c069 int(11) not null,
c070 int(11) not null,
c071 int(11) not null,
c072 int(11) not null,
c073 int(11) not null,
c074 int(11) not null,
c075 int(11) not null,
c076 int(11) not null,
c077 int(11) not null,
c078 int(11) not null,
c079 int(11) not null,
c080 int(11) not null,
c081 int(11) not null,
c082 int(11) not null,
c083 int(11) not null,
c084 int(11) not null,
c085 int(11) not null,
c086 int(11) not null,
c087 int(11) not null,
c088 int(11) not null,
c089 int(11) not null,
c090 int(11) not null,
c091 int(11) not null,
c092 int(11) not null,
c093 int(11) not null,
c094 int(11) not null,
c095 int(11) not null,
c096 int(11) not null,
c097 int(11) not null,
c098 int(11) not null,
c099 int(11) not null,
c100 int(11) not null,
c101 int(11) not null,
c102 int(11) not null,
c103 int(11) not null,
c104 int(11) not null,
c105 int(11) not null,
c106 int(11) not null,
c107 int(11) not null,
c108 int(11) not null,
c109 int(11) not null,
primary key (ai),
unique key tx1 (c002, c003, c004, c005)) engine=ndb;
create index tx2
on t1 (c010, c011, c012, c013);
drop table t1;
mysql-test/t/ndb_alter_table.test
View file @
6c9d30c7
...
...
@@ -199,4 +199,123 @@ drop table t4;
show
tables
;
connection
server1
;
create
table
t1
(
ai
bigint
auto_increment
,
c001
int
(
11
)
not
null
,
c002
int
(
11
)
not
null
,
c003
int
(
11
)
not
null
,
c004
int
(
11
)
not
null
,
c005
int
(
11
)
not
null
,
c006
int
(
11
)
not
null
,
c007
int
(
11
)
not
null
,
c008
int
(
11
)
not
null
,
c009
int
(
11
)
not
null
,
c010
int
(
11
)
not
null
,
c011
int
(
11
)
not
null
,
c012
int
(
11
)
not
null
,
c013
int
(
11
)
not
null
,
c014
int
(
11
)
not
null
,
c015
int
(
11
)
not
null
,
c016
int
(
11
)
not
null
,
c017
int
(
11
)
not
null
,
c018
int
(
11
)
not
null
,
c019
int
(
11
)
not
null
,
c020
int
(
11
)
not
null
,
c021
int
(
11
)
not
null
,
c022
int
(
11
)
not
null
,
c023
int
(
11
)
not
null
,
c024
int
(
11
)
not
null
,
c025
int
(
11
)
not
null
,
c026
int
(
11
)
not
null
,
c027
int
(
11
)
not
null
,
c028
int
(
11
)
not
null
,
c029
int
(
11
)
not
null
,
c030
int
(
11
)
not
null
,
c031
int
(
11
)
not
null
,
c032
int
(
11
)
not
null
,
c033
int
(
11
)
not
null
,
c034
int
(
11
)
not
null
,
c035
int
(
11
)
not
null
,
c036
int
(
11
)
not
null
,
c037
int
(
11
)
not
null
,
c038
int
(
11
)
not
null
,
c039
int
(
11
)
not
null
,
c040
int
(
11
)
not
null
,
c041
int
(
11
)
not
null
,
c042
int
(
11
)
not
null
,
c043
int
(
11
)
not
null
,
c044
int
(
11
)
not
null
,
c045
int
(
11
)
not
null
,
c046
int
(
11
)
not
null
,
c047
int
(
11
)
not
null
,
c048
int
(
11
)
not
null
,
c049
int
(
11
)
not
null
,
c050
int
(
11
)
not
null
,
c051
int
(
11
)
not
null
,
c052
int
(
11
)
not
null
,
c053
int
(
11
)
not
null
,
c054
int
(
11
)
not
null
,
c055
int
(
11
)
not
null
,
c056
int
(
11
)
not
null
,
c057
int
(
11
)
not
null
,
c058
int
(
11
)
not
null
,
c059
int
(
11
)
not
null
,
c060
int
(
11
)
not
null
,
c061
int
(
11
)
not
null
,
c062
int
(
11
)
not
null
,
c063
int
(
11
)
not
null
,
c064
int
(
11
)
not
null
,
c065
int
(
11
)
not
null
,
c066
int
(
11
)
not
null
,
c067
int
(
11
)
not
null
,
c068
int
(
11
)
not
null
,
c069
int
(
11
)
not
null
,
c070
int
(
11
)
not
null
,
c071
int
(
11
)
not
null
,
c072
int
(
11
)
not
null
,
c073
int
(
11
)
not
null
,
c074
int
(
11
)
not
null
,
c075
int
(
11
)
not
null
,
c076
int
(
11
)
not
null
,
c077
int
(
11
)
not
null
,
c078
int
(
11
)
not
null
,
c079
int
(
11
)
not
null
,
c080
int
(
11
)
not
null
,
c081
int
(
11
)
not
null
,
c082
int
(
11
)
not
null
,
c083
int
(
11
)
not
null
,
c084
int
(
11
)
not
null
,
c085
int
(
11
)
not
null
,
c086
int
(
11
)
not
null
,
c087
int
(
11
)
not
null
,
c088
int
(
11
)
not
null
,
c089
int
(
11
)
not
null
,
c090
int
(
11
)
not
null
,
c091
int
(
11
)
not
null
,
c092
int
(
11
)
not
null
,
c093
int
(
11
)
not
null
,
c094
int
(
11
)
not
null
,
c095
int
(
11
)
not
null
,
c096
int
(
11
)
not
null
,
c097
int
(
11
)
not
null
,
c098
int
(
11
)
not
null
,
c099
int
(
11
)
not
null
,
c100
int
(
11
)
not
null
,
c101
int
(
11
)
not
null
,
c102
int
(
11
)
not
null
,
c103
int
(
11
)
not
null
,
c104
int
(
11
)
not
null
,
c105
int
(
11
)
not
null
,
c106
int
(
11
)
not
null
,
c107
int
(
11
)
not
null
,
c108
int
(
11
)
not
null
,
c109
int
(
11
)
not
null
,
primary
key
(
ai
),
unique
key
tx1
(
c002
,
c003
,
c004
,
c005
))
engine
=
ndb
;
create
index
tx2
on
t1
(
c010
,
c011
,
c012
,
c013
);
drop
table
t1
;
# End of 4.1 tests
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View file @
6c9d30c7
...
...
@@ -3036,8 +3036,8 @@ Dbdict::alterTable_backup_mutex_locked(Signal* signal,
lreq
->
gci
=
tablePtr
.
p
->
gciTableCreated
;
lreq
->
requestType
=
AlterTabReq
::
AlterTablePrepare
;
sendSignal
(
rg
,
GSN_ALTER_TAB_REQ
,
signal
,
AlterTabReq
::
SignalLength
,
JBB
);
send
Fragmented
Signal
(
rg
,
GSN_ALTER_TAB_REQ
,
signal
,
AlterTabReq
::
SignalLength
,
JBB
);
}
void
Dbdict
::
alterTableRef
(
Signal
*
signal
,
...
...
@@ -3521,8 +3521,8 @@ Dbdict::execALTER_TAB_CONF(Signal * signal){
lreq
->
gci
=
gci
;
lreq
->
requestType
=
AlterTabReq
::
AlterTableCommit
;
sendSignal
(
rg
,
GSN_ALTER_TAB_REQ
,
signal
,
AlterTabReq
::
SignalLength
,
JBB
);
send
Fragmented
Signal
(
rg
,
GSN_ALTER_TAB_REQ
,
signal
,
AlterTabReq
::
SignalLength
,
JBB
);
}
}
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