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
b828758a
Commit
b828758a
authored
18 years ago
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge fixes 5.0-opt -> 5.1-opt
parent
b2b69607
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
mysql-test/r/ctype_ucs.result
mysql-test/r/ctype_ucs.result
+2
-2
sql/unireg.cc
sql/unireg.cc
+2
-1
No files found.
mysql-test/r/ctype_ucs.result
View file @
b828758a
...
@@ -762,7 +762,7 @@ NOT NULL default 'passive'
...
@@ -762,7 +762,7 @@ NOT NULL default 'passive'
SHOW CREATE TABLE t1;
SHOW CREATE TABLE t1;
Table Create Table
Table Create Table
t1 CREATE TABLE `t1` (
t1 CREATE TABLE `t1` (
`status` enum('active','passive')
character set latin1 collate latin1_general_ci NOT NULL default
'passive'
`status` enum('active','passive')
CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT
'passive'
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1
ALTER TABLE t1 ADD a int NOT NULL AFTER status;
ALTER TABLE t1 ADD a int NOT NULL AFTER status;
CREATE TABLE t2 (
CREATE TABLE t2 (
...
@@ -772,7 +772,7 @@ NOT NULL default 'passive'
...
@@ -772,7 +772,7 @@ NOT NULL default 'passive'
SHOW CREATE TABLE t2;
SHOW CREATE TABLE t2;
Table Create Table
Table Create Table
t2 CREATE TABLE `t2` (
t2 CREATE TABLE `t2` (
`status` enum('active','passive')
character set ucs2 collate ucs2_turkish_ci NOT NULL default
'passive'
`status` enum('active','passive')
CHARACTER SET ucs2 COLLATE ucs2_turkish_ci NOT NULL DEFAULT
'passive'
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1
ALTER TABLE t2 ADD a int NOT NULL AFTER status;
ALTER TABLE t2 ADD a int NOT NULL AFTER status;
DROP TABLE t1,t2;
DROP TABLE t1,t2;
...
...
This diff is collapsed.
Click to expand it.
sql/unireg.cc
View file @
b828758a
...
@@ -866,7 +866,8 @@ static bool make_empty_rec(THD *thd, File file,enum legacy_db_type table_type,
...
@@ -866,7 +866,8 @@ static bool make_empty_rec(THD *thd, File file,enum legacy_db_type table_type,
/*
/*
regfield don't have to be deleted as it's allocated with sql_alloc()
regfield don't have to be deleted as it's allocated with sql_alloc()
*/
*/
Field
*
regfield
=
make_field
((
char
*
)
buff
+
field
->
offset
+
data_offset
,
Field
*
regfield
=
make_field
(
&
share
,
(
char
*
)
buff
+
field
->
offset
+
data_offset
,
field
->
length
,
field
->
length
,
null_pos
+
null_count
/
8
,
null_pos
+
null_count
/
8
,
null_count
&
7
,
null_count
&
7
,
...
...
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