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
27eeeab8
Commit
27eeeab8
authored
Sep 09, 2005
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
after merge fix
parent
a3209971
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
8 deletions
+12
-8
mysql-test/r/ps_1general.result
mysql-test/r/ps_1general.result
+1
-2
mysql-test/r/ps_2myisam.result
mysql-test/r/ps_2myisam.result
+1
-1
mysql-test/r/ps_3innodb.result
mysql-test/r/ps_3innodb.result
+1
-1
mysql-test/r/ps_4heap.result
mysql-test/r/ps_4heap.result
+1
-1
mysql-test/r/ps_5merge.result
mysql-test/r/ps_5merge.result
+2
-2
sql/item.cc
sql/item.cc
+6
-1
No files found.
mysql-test/r/ps_1general.result
View file @
27eeeab8
...
...
@@ -491,8 +491,7 @@ def table 253 64 2 Y 0 31 8
def type 253 10 5 Y 0 31 8
def possible_keys 253 4096 7 Y 0 31 8
def key 253 64 7 Y 0 31 8
def key_len 8 3 1 Y 32928 0 63
def key_len 253 4096 1 Y 128 31 63
def ref 253 1024 0 Y 0 31 8
def rows 8 10 1 Y 32928 0 63
def Extra 253 255 27 N 1 31 8
...
...
mysql-test/r/ps_2myisam.result
View file @
27eeeab8
...
...
@@ -1156,7 +1156,7 @@ def table 253 64 2 Y 0 31 8
def type 253 10 3 Y 0 31 8
def possible_keys 253 4096 0 Y 0 31 8
def key 253 64 0 Y 0 31 8
def key_len
8 3 0 Y 32928 0
63
def key_len
253 4096 0 Y 128 31
63
def ref 253 1024 0 Y 0 31 8
def rows 8 10 1 Y 32928 0 63
def Extra 253 255 0 N 1 31 8
...
...
mysql-test/r/ps_3innodb.result
View file @
27eeeab8
...
...
@@ -1156,7 +1156,7 @@ def table 253 64 2 Y 0 31 8
def type 253 10 3 Y 0 31 8
def possible_keys 253 4096 0 Y 0 31 8
def key 253 64 0 Y 0 31 8
def key_len
8 3 0 Y 32928 0
63
def key_len
253 4096 0 Y 128 31
63
def ref 253 1024 0 Y 0 31 8
def rows 8 10 1 Y 32928 0 63
def Extra 253 255 0 N 1 31 8
...
...
mysql-test/r/ps_4heap.result
View file @
27eeeab8
...
...
@@ -1157,7 +1157,7 @@ def table 253 64 2 Y 0 31 8
def type 253 10 3 Y 0 31 8
def possible_keys 253 4096 0 Y 0 31 8
def key 253 64 0 Y 0 31 8
def key_len
8 3 0 Y 32928 0
63
def key_len
253 4096 0 Y 128 31
63
def ref 253 1024 0 Y 0 31 8
def rows 8 10 1 Y 32928 0 63
def Extra 253 255 0 N 1 31 8
...
...
mysql-test/r/ps_5merge.result
View file @
27eeeab8
...
...
@@ -1199,7 +1199,7 @@ def table 253 64 2 Y 0 31 8
def type 253 10 3 Y 0 31 8
def possible_keys 253 4096 0 Y 0 31 8
def key 253 64 0 Y 0 31 8
def key_len
8 3 0 Y 32928 0
63
def key_len
253 4096 0 Y 128 31
63
def ref 253 1024 0 Y 0 31 8
def rows 8 10 1 Y 32928 0 63
def Extra 253 255 0 N 1 31 8
...
...
@@ -4211,7 +4211,7 @@ def table 253 64 2 Y 0 31 8
def type 253 10 3 Y 0 31 8
def possible_keys 253 4096 0 Y 0 31 8
def key 253 64 0 Y 0 31 8
def key_len
8 3 0 Y 32928 0
63
def key_len
253 4096 0 Y 128 31
63
def ref 253 1024 0 Y 0 31 8
def rows 8 10 1 Y 32928 0 63
def Extra 253 255 0 N 1 31 8
...
...
sql/item.cc
View file @
27eeeab8
...
...
@@ -3627,7 +3627,12 @@ void Item::make_field(Send_field *tmp_field)
void
Item_empty_string
::
make_field
(
Send_field
*
tmp_field
)
{
init_make_field
(
tmp_field
,
FIELD_TYPE_VAR_STRING
);
enum_field_types
type
=
FIELD_TYPE_VAR_STRING
;
if
(
max_length
>=
16777216
)
type
=
FIELD_TYPE_LONG_BLOB
;
else
if
(
max_length
>=
65536
)
type
=
FIELD_TYPE_MEDIUM_BLOB
;
init_make_field
(
tmp_field
,
type
);
}
...
...
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