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
f0f7b941
Commit
f0f7b941
authored
Nov 02, 2005
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents
c2f224be
9c94aef4
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
6 deletions
+19
-6
include/my_base.h
include/my_base.h
+1
-1
mysql-test/r/ndb_basic.result
mysql-test/r/ndb_basic.result
+4
-0
mysql-test/t/ndb_basic.test
mysql-test/t/ndb_basic.test
+9
-0
mysys/base64.c
mysys/base64.c
+3
-3
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+1
-1
sql/handler.cc
sql/handler.cc
+1
-1
No files found.
include/my_base.h
View file @
f0f7b941
...
...
@@ -248,6 +248,7 @@ enum ha_base_keytype {
#define HA_OPTION_CHECKSUM 32
#define HA_OPTION_DELAY_KEY_WRITE 64
#define HA_OPTION_NO_PACK_KEYS 128
/* Reserved for MySQL */
#define HA_OPTION_CREATE_FROM_ENGINE 256
#define HA_OPTION_TEMP_COMPRESS_RECORD ((uint) 16384)
/* set by isamchk */
#define HA_OPTION_READ_ONLY_DATA ((uint) 32768)
/* Set by isamchk */
...
...
@@ -258,7 +259,6 @@ enum ha_base_keytype {
#define HA_CREATE_TMP_TABLE 4
#define HA_CREATE_CHECKSUM 8
#define HA_CREATE_DELAY_KEY_WRITE 64
#define HA_CREATE_FROM_ENGINE 128
/* Bits in flag to _status */
...
...
mysql-test/r/ndb_basic.result
View file @
f0f7b941
...
...
@@ -673,3 +673,7 @@ select * from atablewithareallylongandirritatingname;
a
2
drop table atablewithareallylongandirritatingname;
CREATE TABLE t1 ( b INT ) PACK_KEYS = 0 ENGINE = ndb;
select * from t1;
b
drop table t1;
mysql-test/t/ndb_basic.test
View file @
f0f7b941
...
...
@@ -615,3 +615,12 @@ create table atablewithareallylongandirritatingname (a int);
insert
into
atablewithareallylongandirritatingname
values
(
2
);
select
*
from
atablewithareallylongandirritatingname
;
drop
table
atablewithareallylongandirritatingname
;
#
# BUG#14514
#
CREATE
TABLE
t1
(
b
INT
)
PACK_KEYS
=
0
ENGINE
=
ndb
;
select
*
from
t1
;
drop
table
t1
;
mysys/base64.c
View file @
f0f7b941
...
...
@@ -134,7 +134,7 @@ base64_decode(const char *src, size_t size, void *dst)
{
char
b
[
3
];
size_t
i
=
0
;
void
*
d
=
dst
;
unsigned
char
*
d
=
(
unsigned
char
*
)
dst
;
size_t
j
;
while
(
i
<
size
)
...
...
@@ -186,14 +186,14 @@ base64_decode(const char *src, size_t size, void *dst)
b
[
2
]
=
(
c
>>
0
)
&
0xff
;
for
(
j
=
0
;
j
<
3
-
mark
;
j
++
)
*
(
char
*
)
d
++=
b
[
j
];
*
d
++=
b
[
j
];
}
if
(
i
!=
size
)
{
return
-
1
;
}
return
d
-
dst
;
return
d
-
(
unsigned
char
*
)
dst
;
}
...
...
sql/ha_ndbcluster.cc
View file @
f0f7b941
...
...
@@ -3861,7 +3861,7 @@ int ha_ndbcluster::create(const char *name,
uint
pack_length
,
length
,
i
,
pk_length
=
0
;
const
void
*
data
,
*
pack_data
;
char
name2
[
FN_HEADLEN
];
bool
create_from_engine
=
(
info
->
table_options
&
HA_CREATE_FROM_ENGINE
);
bool
create_from_engine
=
(
info
->
table_options
&
HA_
OPTION_
CREATE_FROM_ENGINE
);
DBUG_ENTER
(
"ha_ndbcluster::create"
);
DBUG_PRINT
(
"enter"
,
(
"name: %s"
,
name
));
...
...
sql/handler.cc
View file @
f0f7b941
...
...
@@ -2016,7 +2016,7 @@ int ha_create_table_from_engine(THD* thd,
DBUG_RETURN
(
3
);
update_create_info_from_table
(
&
create_info
,
&
table
);
create_info
.
table_options
|=
HA_CREATE_FROM_ENGINE
;
create_info
.
table_options
|=
HA_
OPTION_
CREATE_FROM_ENGINE
;
if
(
lower_case_table_names
==
2
&&
!
(
table
.
file
->
table_flags
()
&
HA_FILE_BASED
))
...
...
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