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
09a4d0c7
Commit
09a4d0c7
authored
Oct 29, 2005
by
sergefp@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
4.1->5.0 merge
parents
3e76aa38
f220d874
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
39 additions
and
6 deletions
+39
-6
include/config-netware.h
include/config-netware.h
+1
-4
mysql-test/r/create.result
mysql-test/r/create.result
+11
-0
mysql-test/t/create.test
mysql-test/t/create.test
+8
-0
sql/field.cc
sql/field.cc
+12
-0
sql/field.h
sql/field.h
+5
-0
sql/sql_table.cc
sql/sql_table.cc
+2
-2
No files found.
include/config-netware.h
View file @
09a4d0c7
...
...
@@ -118,15 +118,12 @@ extern "C" {
/* do not use the extended time in LibC sys\stat.h */
#define _POSIX_SOURCE
/* Kernel call on NetWare that will only yield if our time slice is up */
void
kYieldIfTimeSliceUp
(
void
);
/* Some macros for portability */
#define set_timespec(ABSTIME,SEC) { (ABSTIME).tv_sec=time(NULL)+(SEC); (ABSTIME).tv_nsec=0; }
/* extra protection against CPU Hogs on NetWare */
#define NETWARE_YIELD
kYieldIfTimeSliceUp
()
#define NETWARE_YIELD
pthread_yield
()
/* Screen mode for help texts */
#define NETWARE_SET_SCREEN_MODE(A) setscreenmode(A)
...
...
mysql-test/r/create.result
View file @
09a4d0c7
...
...
@@ -641,3 +641,14 @@ create table if not exists t1 (a int);
Warnings:
Note 1050 Table 't1' already exists
drop table t1;
create table t1 (
a varchar(112) charset utf8 collate utf8_bin not null,
primary key (a)
) select 'test' as a ;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` varchar(112) character set utf8 collate utf8_bin NOT NULL default '',
PRIMARY KEY (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
mysql-test/t/create.test
View file @
09a4d0c7
...
...
@@ -545,4 +545,12 @@ create table t1 (a int);
create
table
if
not
exists
t1
(
a
int
);
drop
table
t1
;
# BUG#14139
create
table
t1
(
a
varchar
(
112
)
charset
utf8
collate
utf8_bin
not
null
,
primary
key
(
a
)
)
select
'test'
as
a
;
show
create
table
t1
;
drop
table
t1
;
# End of 4.1 tests
sql/field.cc
View file @
09a4d0c7
...
...
@@ -8186,8 +8186,20 @@ void Field_bit_as_char::sql_type(String &res) const
Handling of field and create_field
*****************************************************************************/
/*
Convert create_field::length from number of characters to number of bytes
SYNOPSIS
create_field::create_length_to_internal_length()
DESCRIPTION
Convert create_field::length from number of characters to number of bytes,
save original value in chars_length.
*/
void
create_field
::
create_length_to_internal_length
(
void
)
{
chars_length
=
length
;
switch
(
sql_type
)
{
case
MYSQL_TYPE_TINY_BLOB
:
case
MYSQL_TYPE_MEDIUM_BLOB
:
...
...
sql/field.h
View file @
09a4d0c7
...
...
@@ -1368,6 +1368,11 @@ public:
LEX_STRING
comment
;
// Comment for field
Item
*
def
;
// Default value
enum
enum_field_types
sql_type
;
/*
At various stages in execution this can be length of field in bytes or
max number of characters.
*/
ulong
length
;
ulong
length
;
uint
decimals
,
flags
,
pack_length
,
key_length
;
Field
::
utype
unireg_check
;
...
...
sql/sql_table.cc
View file @
09a4d0c7
...
...
@@ -839,8 +839,8 @@ static int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info,
sql_field
->
charset
=
(
dup_field
->
charset
?
dup_field
->
charset
:
create_info
->
default_table_charset
);
sql_field
->
length
=
dup_field
->
length
;
sql_field
->
pack_length
=
dup_field
->
pack_length
;
sql_field
->
length
=
dup_field
->
chars_
length
;
sql_field
->
pack_length
=
dup_field
->
pack_length
;
sql_field
->
key_length
=
dup_field
->
key_length
;
sql_field
->
create_length_to_internal_length
();
sql_field
->
decimals
=
dup_field
->
decimals
;
...
...
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