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
eb4a309b
Commit
eb4a309b
authored
Jul 14, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/opt/local/work/mysql-4.1-root
parents
86cb32b7
a16a61d9
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
101 additions
and
70 deletions
+101
-70
mysql-test/r/ps_2myisam.result
mysql-test/r/ps_2myisam.result
+10
-10
mysql-test/r/ps_3innodb.result
mysql-test/r/ps_3innodb.result
+10
-10
mysql-test/r/ps_4heap.result
mysql-test/r/ps_4heap.result
+8
-8
mysql-test/r/ps_5merge.result
mysql-test/r/ps_5merge.result
+20
-20
mysql-test/r/ps_6bdb.result
mysql-test/r/ps_6bdb.result
+10
-10
mysql-test/r/ps_7ndb.result
mysql-test/r/ps_7ndb.result
+10
-10
sql/field.cc
sql/field.cc
+3
-1
tests/mysql_client_test.c
tests/mysql_client_test.c
+30
-1
No files found.
mysql-test/r/ps_2myisam.result
View file @
eb4a309b
...
@@ -77,8 +77,8 @@ def test t9 t9 c25 c25 252 65535 4 Y 144 0 63
...
@@ -77,8 +77,8 @@ def test t9 t9 c25 c25 252 65535 4 Y 144 0 63
def test t9 t9 c26 c26 252 65535 4 Y 16 0 8
def test t9 t9 c26 c26 252 65535 4 Y 16 0 8
def test t9 t9 c27 c27 252 16777215 10 Y 144 0 63
def test t9 t9 c27 c27 252 16777215 10 Y 144 0 63
def test t9 t9 c28 c28 252 16777215 10 Y 16 0 8
def test t9 t9 c28 c28 252 16777215 10 Y 16 0 8
def test t9 t9 c29 c29 252
1677721
5 8 Y 144 0 63
def test t9 t9 c29 c29 252
429496729
5 8 Y 144 0 63
def test t9 t9 c30 c30 252
1677721
5 8 Y 16 0 8
def test t9 t9 c30 c30 252
429496729
5 8 Y 16 0 8
def test t9 t9 c31 c31 254 5 3 Y 256 0 8
def test t9 t9 c31 c31 254 5 3 Y 256 0 8
def test t9 t9 c32 c32 254 24 7 Y 2048 0 8
def test t9 t9 c32 c32 254 24 7 Y 2048 0 8
c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 c31 c32
c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 c31 c32
...
@@ -1812,17 +1812,17 @@ def test t5 t5 param02 param02 5 20 1 Y 32768 31 63
...
@@ -1812,17 +1812,17 @@ def test t5 t5 param02 param02 5 20 1 Y 32768 31 63
def test t5 t5 const03 const03 5 23 1 N 32769 31 63
def test t5 t5 const03 const03 5 23 1 N 32769 31 63
def test t5 t5 param03 param03 5 20 1 Y 32768 31 63
def test t5 t5 param03 param03 5 20 1 Y 32768 31 63
def test t5 t5 const04 const04 254 3 3 N 1 0 8
def test t5 t5 const04 const04 254 3 3 N 1 0 8
def test t5 t5 param04 param04 252
1677721
5 3 Y 16 0 8
def test t5 t5 param04 param04 252
429496729
5 3 Y 16 0 8
def test t5 t5 const05 const05 254 3 3 N 129 0 63
def test t5 t5 const05 const05 254 3 3 N 129 0 63
def test t5 t5 param05 param05 252
1677721
5 3 Y 144 0 63
def test t5 t5 param05 param05 252
429496729
5 3 Y 144 0 63
def test t5 t5 const06 const06 253 10 10 N 1 0 8
def test t5 t5 const06 const06 253 10 10 N 1 0 8
def test t5 t5 param06 param06 252
1677721
5 10 Y 16 0 8
def test t5 t5 param06 param06 252
429496729
5 10 Y 16 0 8
def test t5 t5 const07 const07 10 10 10 Y 128 0 63
def test t5 t5 const07 const07 10 10 10 Y 128 0 63
def test t5 t5 param07 param07 252
1677721
5 10 Y 144 0 63
def test t5 t5 param07 param07 252
429496729
5 10 Y 144 0 63
def test t5 t5 const08 const08 253 19 19 N 1 0 8
def test t5 t5 const08 const08 253 19 19 N 1 0 8
def test t5 t5 param08 param08 252
1677721
5 19 Y 16 0 8
def test t5 t5 param08 param08 252
429496729
5 19 Y 16 0 8
def test t5 t5 const09 const09 12 19 19 Y 128 0 63
def test t5 t5 const09 const09 12 19 19 Y 128 0 63
def test t5 t5 param09 param09 252
1677721
5 19 Y 144 0 63
def test t5 t5 param09 param09 252
429496729
5 19 Y 144 0 63
def test t5 t5 const10 const10 3 10 9 N 32769 0 63
def test t5 t5 const10 const10 3 10 9 N 32769 0 63
def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
def test t5 t5 const11 const11 3 4 4 Y 32768 0 63
def test t5 t5 const11 const11 3 4 4 Y 32768 0 63
...
@@ -1830,8 +1830,8 @@ def test t5 t5 param11 param11 8 20 4 Y 32768 0 63
...
@@ -1830,8 +1830,8 @@ def test t5 t5 param11 param11 8 20 4 Y 32768 0 63
def test t5 t5 const12 const12 254 0 0 Y 128 0 63
def test t5 t5 const12 const12 254 0 0 Y 128 0 63
def test t5 t5 param12 param12 8 20 0 Y 32768 0 63
def test t5 t5 param12 param12 8 20 0 Y 32768 0 63
def test t5 t5 param13 param13 5 20 0 Y 32768 31 63
def test t5 t5 param13 param13 5 20 0 Y 32768 31 63
def test t5 t5 param14 param14 252
1677721
5 0 Y 16 0 8
def test t5 t5 param14 param14 252
429496729
5 0 Y 16 0 8
def test t5 t5 param15 param15 252
1677721
5 0 Y 144 0 63
def test t5 t5 param15 param15 252
429496729
5 0 Y 144 0 63
const01 8
const01 8
param01 8
param01 8
const02 8.0
const02 8.0
...
...
mysql-test/r/ps_3innodb.result
View file @
eb4a309b
...
@@ -77,8 +77,8 @@ def test t9 t9 c25 c25 252 65535 4 Y 144 0 63
...
@@ -77,8 +77,8 @@ def test t9 t9 c25 c25 252 65535 4 Y 144 0 63
def test t9 t9 c26 c26 252 65535 4 Y 16 0 8
def test t9 t9 c26 c26 252 65535 4 Y 16 0 8
def test t9 t9 c27 c27 252 16777215 10 Y 144 0 63
def test t9 t9 c27 c27 252 16777215 10 Y 144 0 63
def test t9 t9 c28 c28 252 16777215 10 Y 16 0 8
def test t9 t9 c28 c28 252 16777215 10 Y 16 0 8
def test t9 t9 c29 c29 252
1677721
5 8 Y 144 0 63
def test t9 t9 c29 c29 252
429496729
5 8 Y 144 0 63
def test t9 t9 c30 c30 252
1677721
5 8 Y 16 0 8
def test t9 t9 c30 c30 252
429496729
5 8 Y 16 0 8
def test t9 t9 c31 c31 254 5 3 Y 256 0 8
def test t9 t9 c31 c31 254 5 3 Y 256 0 8
def test t9 t9 c32 c32 254 24 7 Y 2048 0 8
def test t9 t9 c32 c32 254 24 7 Y 2048 0 8
c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 c31 c32
c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 c31 c32
...
@@ -1795,17 +1795,17 @@ def test t5 t5 param02 param02 5 20 1 Y 32768 31 63
...
@@ -1795,17 +1795,17 @@ def test t5 t5 param02 param02 5 20 1 Y 32768 31 63
def test t5 t5 const03 const03 5 23 1 N 32769 31 63
def test t5 t5 const03 const03 5 23 1 N 32769 31 63
def test t5 t5 param03 param03 5 20 1 Y 32768 31 63
def test t5 t5 param03 param03 5 20 1 Y 32768 31 63
def test t5 t5 const04 const04 254 3 3 N 1 0 8
def test t5 t5 const04 const04 254 3 3 N 1 0 8
def test t5 t5 param04 param04 252
1677721
5 3 Y 16 0 8
def test t5 t5 param04 param04 252
429496729
5 3 Y 16 0 8
def test t5 t5 const05 const05 254 3 3 N 129 0 63
def test t5 t5 const05 const05 254 3 3 N 129 0 63
def test t5 t5 param05 param05 252
1677721
5 3 Y 144 0 63
def test t5 t5 param05 param05 252
429496729
5 3 Y 144 0 63
def test t5 t5 const06 const06 253 10 10 N 1 0 8
def test t5 t5 const06 const06 253 10 10 N 1 0 8
def test t5 t5 param06 param06 252
1677721
5 10 Y 16 0 8
def test t5 t5 param06 param06 252
429496729
5 10 Y 16 0 8
def test t5 t5 const07 const07 10 10 10 Y 128 0 63
def test t5 t5 const07 const07 10 10 10 Y 128 0 63
def test t5 t5 param07 param07 252
1677721
5 10 Y 144 0 63
def test t5 t5 param07 param07 252
429496729
5 10 Y 144 0 63
def test t5 t5 const08 const08 253 19 19 N 1 0 8
def test t5 t5 const08 const08 253 19 19 N 1 0 8
def test t5 t5 param08 param08 252
1677721
5 19 Y 16 0 8
def test t5 t5 param08 param08 252
429496729
5 19 Y 16 0 8
def test t5 t5 const09 const09 12 19 19 Y 128 0 63
def test t5 t5 const09 const09 12 19 19 Y 128 0 63
def test t5 t5 param09 param09 252
1677721
5 19 Y 144 0 63
def test t5 t5 param09 param09 252
429496729
5 19 Y 144 0 63
def test t5 t5 const10 const10 3 10 9 N 32769 0 63
def test t5 t5 const10 const10 3 10 9 N 32769 0 63
def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
def test t5 t5 const11 const11 3 4 4 Y 32768 0 63
def test t5 t5 const11 const11 3 4 4 Y 32768 0 63
...
@@ -1813,8 +1813,8 @@ def test t5 t5 param11 param11 8 20 4 Y 32768 0 63
...
@@ -1813,8 +1813,8 @@ def test t5 t5 param11 param11 8 20 4 Y 32768 0 63
def test t5 t5 const12 const12 254 0 0 Y 128 0 63
def test t5 t5 const12 const12 254 0 0 Y 128 0 63
def test t5 t5 param12 param12 8 20 0 Y 32768 0 63
def test t5 t5 param12 param12 8 20 0 Y 32768 0 63
def test t5 t5 param13 param13 5 20 0 Y 32768 31 63
def test t5 t5 param13 param13 5 20 0 Y 32768 31 63
def test t5 t5 param14 param14 252
1677721
5 0 Y 16 0 8
def test t5 t5 param14 param14 252
429496729
5 0 Y 16 0 8
def test t5 t5 param15 param15 252
1677721
5 0 Y 144 0 63
def test t5 t5 param15 param15 252
429496729
5 0 Y 144 0 63
const01 8
const01 8
param01 8
param01 8
const02 8.0
const02 8.0
...
...
mysql-test/r/ps_4heap.result
View file @
eb4a309b
...
@@ -1796,17 +1796,17 @@ def test t5 t5 param02 param02 5 20 1 Y 32768 31 63
...
@@ -1796,17 +1796,17 @@ def test t5 t5 param02 param02 5 20 1 Y 32768 31 63
def test t5 t5 const03 const03 5 23 1 N 32769 31 63
def test t5 t5 const03 const03 5 23 1 N 32769 31 63
def test t5 t5 param03 param03 5 20 1 Y 32768 31 63
def test t5 t5 param03 param03 5 20 1 Y 32768 31 63
def test t5 t5 const04 const04 254 3 3 N 1 0 8
def test t5 t5 const04 const04 254 3 3 N 1 0 8
def test t5 t5 param04 param04 252
1677721
5 3 Y 16 0 8
def test t5 t5 param04 param04 252
429496729
5 3 Y 16 0 8
def test t5 t5 const05 const05 254 3 3 N 129 0 63
def test t5 t5 const05 const05 254 3 3 N 129 0 63
def test t5 t5 param05 param05 252
1677721
5 3 Y 144 0 63
def test t5 t5 param05 param05 252
429496729
5 3 Y 144 0 63
def test t5 t5 const06 const06 253 10 10 N 1 0 8
def test t5 t5 const06 const06 253 10 10 N 1 0 8
def test t5 t5 param06 param06 252
1677721
5 10 Y 16 0 8
def test t5 t5 param06 param06 252
429496729
5 10 Y 16 0 8
def test t5 t5 const07 const07 10 10 10 Y 128 0 63
def test t5 t5 const07 const07 10 10 10 Y 128 0 63
def test t5 t5 param07 param07 252
1677721
5 10 Y 144 0 63
def test t5 t5 param07 param07 252
429496729
5 10 Y 144 0 63
def test t5 t5 const08 const08 253 19 19 N 1 0 8
def test t5 t5 const08 const08 253 19 19 N 1 0 8
def test t5 t5 param08 param08 252
1677721
5 19 Y 16 0 8
def test t5 t5 param08 param08 252
429496729
5 19 Y 16 0 8
def test t5 t5 const09 const09 12 19 19 Y 128 0 63
def test t5 t5 const09 const09 12 19 19 Y 128 0 63
def test t5 t5 param09 param09 252
1677721
5 19 Y 144 0 63
def test t5 t5 param09 param09 252
429496729
5 19 Y 144 0 63
def test t5 t5 const10 const10 3 10 9 N 32769 0 63
def test t5 t5 const10 const10 3 10 9 N 32769 0 63
def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
def test t5 t5 const11 const11 3 4 4 Y 32768 0 63
def test t5 t5 const11 const11 3 4 4 Y 32768 0 63
...
@@ -1814,8 +1814,8 @@ def test t5 t5 param11 param11 8 20 4 Y 32768 0 63
...
@@ -1814,8 +1814,8 @@ def test t5 t5 param11 param11 8 20 4 Y 32768 0 63
def test t5 t5 const12 const12 254 0 0 Y 128 0 63
def test t5 t5 const12 const12 254 0 0 Y 128 0 63
def test t5 t5 param12 param12 8 20 0 Y 32768 0 63
def test t5 t5 param12 param12 8 20 0 Y 32768 0 63
def test t5 t5 param13 param13 5 20 0 Y 32768 31 63
def test t5 t5 param13 param13 5 20 0 Y 32768 31 63
def test t5 t5 param14 param14 252
1677721
5 0 Y 16 0 8
def test t5 t5 param14 param14 252
429496729
5 0 Y 16 0 8
def test t5 t5 param15 param15 252
1677721
5 0 Y 144 0 63
def test t5 t5 param15 param15 252
429496729
5 0 Y 144 0 63
const01 8
const01 8
param01 8
param01 8
const02 8.0
const02 8.0
...
...
mysql-test/r/ps_5merge.result
View file @
eb4a309b
...
@@ -120,8 +120,8 @@ def test t9 t9 c25 c25 252 65535 4 Y 144 0 63
...
@@ -120,8 +120,8 @@ def test t9 t9 c25 c25 252 65535 4 Y 144 0 63
def test t9 t9 c26 c26 252 65535 4 Y 16 0 8
def test t9 t9 c26 c26 252 65535 4 Y 16 0 8
def test t9 t9 c27 c27 252 16777215 10 Y 144 0 63
def test t9 t9 c27 c27 252 16777215 10 Y 144 0 63
def test t9 t9 c28 c28 252 16777215 10 Y 16 0 8
def test t9 t9 c28 c28 252 16777215 10 Y 16 0 8
def test t9 t9 c29 c29 252
1677721
5 8 Y 144 0 63
def test t9 t9 c29 c29 252
429496729
5 8 Y 144 0 63
def test t9 t9 c30 c30 252
1677721
5 8 Y 16 0 8
def test t9 t9 c30 c30 252
429496729
5 8 Y 16 0 8
def test t9 t9 c31 c31 254 5 3 Y 256 0 8
def test t9 t9 c31 c31 254 5 3 Y 256 0 8
def test t9 t9 c32 c32 254 24 7 Y 2048 0 8
def test t9 t9 c32 c32 254 24 7 Y 2048 0 8
c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 c31 c32
c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 c31 c32
...
@@ -1732,17 +1732,17 @@ def test t5 t5 param02 param02 5 20 1 Y 32768 31 63
...
@@ -1732,17 +1732,17 @@ def test t5 t5 param02 param02 5 20 1 Y 32768 31 63
def test t5 t5 const03 const03 5 23 1 N 32769 31 63
def test t5 t5 const03 const03 5 23 1 N 32769 31 63
def test t5 t5 param03 param03 5 20 1 Y 32768 31 63
def test t5 t5 param03 param03 5 20 1 Y 32768 31 63
def test t5 t5 const04 const04 254 3 3 N 1 0 8
def test t5 t5 const04 const04 254 3 3 N 1 0 8
def test t5 t5 param04 param04 252
1677721
5 3 Y 16 0 8
def test t5 t5 param04 param04 252
429496729
5 3 Y 16 0 8
def test t5 t5 const05 const05 254 3 3 N 129 0 63
def test t5 t5 const05 const05 254 3 3 N 129 0 63
def test t5 t5 param05 param05 252
1677721
5 3 Y 144 0 63
def test t5 t5 param05 param05 252
429496729
5 3 Y 144 0 63
def test t5 t5 const06 const06 253 10 10 N 1 0 8
def test t5 t5 const06 const06 253 10 10 N 1 0 8
def test t5 t5 param06 param06 252
1677721
5 10 Y 16 0 8
def test t5 t5 param06 param06 252
429496729
5 10 Y 16 0 8
def test t5 t5 const07 const07 10 10 10 Y 128 0 63
def test t5 t5 const07 const07 10 10 10 Y 128 0 63
def test t5 t5 param07 param07 252
1677721
5 10 Y 144 0 63
def test t5 t5 param07 param07 252
429496729
5 10 Y 144 0 63
def test t5 t5 const08 const08 253 19 19 N 1 0 8
def test t5 t5 const08 const08 253 19 19 N 1 0 8
def test t5 t5 param08 param08 252
1677721
5 19 Y 16 0 8
def test t5 t5 param08 param08 252
429496729
5 19 Y 16 0 8
def test t5 t5 const09 const09 12 19 19 Y 128 0 63
def test t5 t5 const09 const09 12 19 19 Y 128 0 63
def test t5 t5 param09 param09 252
1677721
5 19 Y 144 0 63
def test t5 t5 param09 param09 252
429496729
5 19 Y 144 0 63
def test t5 t5 const10 const10 3 10 9 N 32769 0 63
def test t5 t5 const10 const10 3 10 9 N 32769 0 63
def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
def test t5 t5 const11 const11 3 4 4 Y 32768 0 63
def test t5 t5 const11 const11 3 4 4 Y 32768 0 63
...
@@ -1750,8 +1750,8 @@ def test t5 t5 param11 param11 8 20 4 Y 32768 0 63
...
@@ -1750,8 +1750,8 @@ def test t5 t5 param11 param11 8 20 4 Y 32768 0 63
def test t5 t5 const12 const12 254 0 0 Y 128 0 63
def test t5 t5 const12 const12 254 0 0 Y 128 0 63
def test t5 t5 param12 param12 8 20 0 Y 32768 0 63
def test t5 t5 param12 param12 8 20 0 Y 32768 0 63
def test t5 t5 param13 param13 5 20 0 Y 32768 31 63
def test t5 t5 param13 param13 5 20 0 Y 32768 31 63
def test t5 t5 param14 param14 252
1677721
5 0 Y 16 0 8
def test t5 t5 param14 param14 252
429496729
5 0 Y 16 0 8
def test t5 t5 param15 param15 252
1677721
5 0 Y 144 0 63
def test t5 t5 param15 param15 252
429496729
5 0 Y 144 0 63
const01 8
const01 8
param01 8
param01 8
const02 8.0
const02 8.0
...
@@ -3134,8 +3134,8 @@ def test t9 t9 c25 c25 252 65535 4 Y 144 0 63
...
@@ -3134,8 +3134,8 @@ def test t9 t9 c25 c25 252 65535 4 Y 144 0 63
def test t9 t9 c26 c26 252 65535 4 Y 16 0 8
def test t9 t9 c26 c26 252 65535 4 Y 16 0 8
def test t9 t9 c27 c27 252 16777215 10 Y 144 0 63
def test t9 t9 c27 c27 252 16777215 10 Y 144 0 63
def test t9 t9 c28 c28 252 16777215 10 Y 16 0 8
def test t9 t9 c28 c28 252 16777215 10 Y 16 0 8
def test t9 t9 c29 c29 252
1677721
5 8 Y 144 0 63
def test t9 t9 c29 c29 252
429496729
5 8 Y 144 0 63
def test t9 t9 c30 c30 252
1677721
5 8 Y 16 0 8
def test t9 t9 c30 c30 252
429496729
5 8 Y 16 0 8
def test t9 t9 c31 c31 254 5 3 Y 256 0 8
def test t9 t9 c31 c31 254 5 3 Y 256 0 8
def test t9 t9 c32 c32 254 24 7 Y 2048 0 8
def test t9 t9 c32 c32 254 24 7 Y 2048 0 8
c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 c31 c32
c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 c31 c32
...
@@ -4746,17 +4746,17 @@ def test t5 t5 param02 param02 5 20 1 Y 32768 31 63
...
@@ -4746,17 +4746,17 @@ def test t5 t5 param02 param02 5 20 1 Y 32768 31 63
def test t5 t5 const03 const03 5 23 1 N 32769 31 63
def test t5 t5 const03 const03 5 23 1 N 32769 31 63
def test t5 t5 param03 param03 5 20 1 Y 32768 31 63
def test t5 t5 param03 param03 5 20 1 Y 32768 31 63
def test t5 t5 const04 const04 254 3 3 N 1 0 8
def test t5 t5 const04 const04 254 3 3 N 1 0 8
def test t5 t5 param04 param04 252
1677721
5 3 Y 16 0 8
def test t5 t5 param04 param04 252
429496729
5 3 Y 16 0 8
def test t5 t5 const05 const05 254 3 3 N 129 0 63
def test t5 t5 const05 const05 254 3 3 N 129 0 63
def test t5 t5 param05 param05 252
1677721
5 3 Y 144 0 63
def test t5 t5 param05 param05 252
429496729
5 3 Y 144 0 63
def test t5 t5 const06 const06 253 10 10 N 1 0 8
def test t5 t5 const06 const06 253 10 10 N 1 0 8
def test t5 t5 param06 param06 252
1677721
5 10 Y 16 0 8
def test t5 t5 param06 param06 252
429496729
5 10 Y 16 0 8
def test t5 t5 const07 const07 10 10 10 Y 128 0 63
def test t5 t5 const07 const07 10 10 10 Y 128 0 63
def test t5 t5 param07 param07 252
1677721
5 10 Y 144 0 63
def test t5 t5 param07 param07 252
429496729
5 10 Y 144 0 63
def test t5 t5 const08 const08 253 19 19 N 1 0 8
def test t5 t5 const08 const08 253 19 19 N 1 0 8
def test t5 t5 param08 param08 252
1677721
5 19 Y 16 0 8
def test t5 t5 param08 param08 252
429496729
5 19 Y 16 0 8
def test t5 t5 const09 const09 12 19 19 Y 128 0 63
def test t5 t5 const09 const09 12 19 19 Y 128 0 63
def test t5 t5 param09 param09 252
1677721
5 19 Y 144 0 63
def test t5 t5 param09 param09 252
429496729
5 19 Y 144 0 63
def test t5 t5 const10 const10 3 10 9 N 32769 0 63
def test t5 t5 const10 const10 3 10 9 N 32769 0 63
def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
def test t5 t5 const11 const11 3 4 4 Y 32768 0 63
def test t5 t5 const11 const11 3 4 4 Y 32768 0 63
...
@@ -4764,8 +4764,8 @@ def test t5 t5 param11 param11 8 20 4 Y 32768 0 63
...
@@ -4764,8 +4764,8 @@ def test t5 t5 param11 param11 8 20 4 Y 32768 0 63
def test t5 t5 const12 const12 254 0 0 Y 128 0 63
def test t5 t5 const12 const12 254 0 0 Y 128 0 63
def test t5 t5 param12 param12 8 20 0 Y 32768 0 63
def test t5 t5 param12 param12 8 20 0 Y 32768 0 63
def test t5 t5 param13 param13 5 20 0 Y 32768 31 63
def test t5 t5 param13 param13 5 20 0 Y 32768 31 63
def test t5 t5 param14 param14 252
1677721
5 0 Y 16 0 8
def test t5 t5 param14 param14 252
429496729
5 0 Y 16 0 8
def test t5 t5 param15 param15 252
1677721
5 0 Y 144 0 63
def test t5 t5 param15 param15 252
429496729
5 0 Y 144 0 63
const01 8
const01 8
param01 8
param01 8
const02 8.0
const02 8.0
...
...
mysql-test/r/ps_6bdb.result
View file @
eb4a309b
...
@@ -77,8 +77,8 @@ def test t9 t9 c25 c25 252 65535 4 Y 144 0 63
...
@@ -77,8 +77,8 @@ def test t9 t9 c25 c25 252 65535 4 Y 144 0 63
def test t9 t9 c26 c26 252 65535 4 Y 16 0 8
def test t9 t9 c26 c26 252 65535 4 Y 16 0 8
def test t9 t9 c27 c27 252 16777215 10 Y 144 0 63
def test t9 t9 c27 c27 252 16777215 10 Y 144 0 63
def test t9 t9 c28 c28 252 16777215 10 Y 16 0 8
def test t9 t9 c28 c28 252 16777215 10 Y 16 0 8
def test t9 t9 c29 c29 252
1677721
5 8 Y 144 0 63
def test t9 t9 c29 c29 252
429496729
5 8 Y 144 0 63
def test t9 t9 c30 c30 252
1677721
5 8 Y 16 0 8
def test t9 t9 c30 c30 252
429496729
5 8 Y 16 0 8
def test t9 t9 c31 c31 254 5 3 Y 256 0 8
def test t9 t9 c31 c31 254 5 3 Y 256 0 8
def test t9 t9 c32 c32 254 24 7 Y 2048 0 8
def test t9 t9 c32 c32 254 24 7 Y 2048 0 8
c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 c31 c32
c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 c31 c32
...
@@ -1795,17 +1795,17 @@ def test t5 t5 param02 param02 5 20 1 Y 32768 31 63
...
@@ -1795,17 +1795,17 @@ def test t5 t5 param02 param02 5 20 1 Y 32768 31 63
def test t5 t5 const03 const03 5 23 1 N 32769 31 63
def test t5 t5 const03 const03 5 23 1 N 32769 31 63
def test t5 t5 param03 param03 5 20 1 Y 32768 31 63
def test t5 t5 param03 param03 5 20 1 Y 32768 31 63
def test t5 t5 const04 const04 254 3 3 N 1 0 8
def test t5 t5 const04 const04 254 3 3 N 1 0 8
def test t5 t5 param04 param04 252
1677721
5 3 Y 16 0 8
def test t5 t5 param04 param04 252
429496729
5 3 Y 16 0 8
def test t5 t5 const05 const05 254 3 3 N 129 0 63
def test t5 t5 const05 const05 254 3 3 N 129 0 63
def test t5 t5 param05 param05 252
1677721
5 3 Y 144 0 63
def test t5 t5 param05 param05 252
429496729
5 3 Y 144 0 63
def test t5 t5 const06 const06 253 10 10 N 1 0 8
def test t5 t5 const06 const06 253 10 10 N 1 0 8
def test t5 t5 param06 param06 252
1677721
5 10 Y 16 0 8
def test t5 t5 param06 param06 252
429496729
5 10 Y 16 0 8
def test t5 t5 const07 const07 10 10 10 Y 128 0 63
def test t5 t5 const07 const07 10 10 10 Y 128 0 63
def test t5 t5 param07 param07 252
1677721
5 10 Y 144 0 63
def test t5 t5 param07 param07 252
429496729
5 10 Y 144 0 63
def test t5 t5 const08 const08 253 19 19 N 1 0 8
def test t5 t5 const08 const08 253 19 19 N 1 0 8
def test t5 t5 param08 param08 252
1677721
5 19 Y 16 0 8
def test t5 t5 param08 param08 252
429496729
5 19 Y 16 0 8
def test t5 t5 const09 const09 12 19 19 Y 128 0 63
def test t5 t5 const09 const09 12 19 19 Y 128 0 63
def test t5 t5 param09 param09 252
1677721
5 19 Y 144 0 63
def test t5 t5 param09 param09 252
429496729
5 19 Y 144 0 63
def test t5 t5 const10 const10 3 10 9 N 32769 0 63
def test t5 t5 const10 const10 3 10 9 N 32769 0 63
def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
def test t5 t5 const11 const11 3 4 4 Y 32768 0 63
def test t5 t5 const11 const11 3 4 4 Y 32768 0 63
...
@@ -1813,8 +1813,8 @@ def test t5 t5 param11 param11 8 20 4 Y 32768 0 63
...
@@ -1813,8 +1813,8 @@ def test t5 t5 param11 param11 8 20 4 Y 32768 0 63
def test t5 t5 const12 const12 254 0 0 Y 128 0 63
def test t5 t5 const12 const12 254 0 0 Y 128 0 63
def test t5 t5 param12 param12 8 20 0 Y 32768 0 63
def test t5 t5 param12 param12 8 20 0 Y 32768 0 63
def test t5 t5 param13 param13 5 20 0 Y 32768 31 63
def test t5 t5 param13 param13 5 20 0 Y 32768 31 63
def test t5 t5 param14 param14 252
1677721
5 0 Y 16 0 8
def test t5 t5 param14 param14 252
429496729
5 0 Y 16 0 8
def test t5 t5 param15 param15 252
1677721
5 0 Y 144 0 63
def test t5 t5 param15 param15 252
429496729
5 0 Y 144 0 63
const01 8
const01 8
param01 8
param01 8
const02 8.0
const02 8.0
...
...
mysql-test/r/ps_7ndb.result
View file @
eb4a309b
...
@@ -77,8 +77,8 @@ def test t9 t9 c25 c25 252 65535 4 Y 144 0 63
...
@@ -77,8 +77,8 @@ def test t9 t9 c25 c25 252 65535 4 Y 144 0 63
def test t9 t9 c26 c26 252 65535 4 Y 16 0 8
def test t9 t9 c26 c26 252 65535 4 Y 16 0 8
def test t9 t9 c27 c27 252 16777215 10 Y 144 0 63
def test t9 t9 c27 c27 252 16777215 10 Y 144 0 63
def test t9 t9 c28 c28 252 16777215 10 Y 16 0 8
def test t9 t9 c28 c28 252 16777215 10 Y 16 0 8
def test t9 t9 c29 c29 252
1677721
5 8 Y 144 0 63
def test t9 t9 c29 c29 252
429496729
5 8 Y 144 0 63
def test t9 t9 c30 c30 252
1677721
5 8 Y 16 0 8
def test t9 t9 c30 c30 252
429496729
5 8 Y 16 0 8
def test t9 t9 c31 c31 254 5 3 Y 256 0 8
def test t9 t9 c31 c31 254 5 3 Y 256 0 8
def test t9 t9 c32 c32 254 24 7 Y 2048 0 8
def test t9 t9 c32 c32 254 24 7 Y 2048 0 8
c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 c31 c32
c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 c31 c32
...
@@ -1795,17 +1795,17 @@ def test t5 t5 param02 param02 5 20 1 Y 32768 31 63
...
@@ -1795,17 +1795,17 @@ def test t5 t5 param02 param02 5 20 1 Y 32768 31 63
def test t5 t5 const03 const03 5 23 1 N 32769 31 63
def test t5 t5 const03 const03 5 23 1 N 32769 31 63
def test t5 t5 param03 param03 5 20 1 Y 32768 31 63
def test t5 t5 param03 param03 5 20 1 Y 32768 31 63
def test t5 t5 const04 const04 254 3 3 N 1 0 8
def test t5 t5 const04 const04 254 3 3 N 1 0 8
def test t5 t5 param04 param04 252
1677721
5 3 Y 16 0 8
def test t5 t5 param04 param04 252
429496729
5 3 Y 16 0 8
def test t5 t5 const05 const05 254 3 3 N 129 0 63
def test t5 t5 const05 const05 254 3 3 N 129 0 63
def test t5 t5 param05 param05 252
1677721
5 3 Y 144 0 63
def test t5 t5 param05 param05 252
429496729
5 3 Y 144 0 63
def test t5 t5 const06 const06 253 10 10 N 1 0 8
def test t5 t5 const06 const06 253 10 10 N 1 0 8
def test t5 t5 param06 param06 252
1677721
5 10 Y 16 0 8
def test t5 t5 param06 param06 252
429496729
5 10 Y 16 0 8
def test t5 t5 const07 const07 10 10 10 Y 128 0 63
def test t5 t5 const07 const07 10 10 10 Y 128 0 63
def test t5 t5 param07 param07 252
1677721
5 10 Y 144 0 63
def test t5 t5 param07 param07 252
429496729
5 10 Y 144 0 63
def test t5 t5 const08 const08 253 19 19 N 1 0 8
def test t5 t5 const08 const08 253 19 19 N 1 0 8
def test t5 t5 param08 param08 252
1677721
5 19 Y 16 0 8
def test t5 t5 param08 param08 252
429496729
5 19 Y 16 0 8
def test t5 t5 const09 const09 12 19 19 Y 128 0 63
def test t5 t5 const09 const09 12 19 19 Y 128 0 63
def test t5 t5 param09 param09 252
1677721
5 19 Y 144 0 63
def test t5 t5 param09 param09 252
429496729
5 19 Y 144 0 63
def test t5 t5 const10 const10 3 10 9 N 32769 0 63
def test t5 t5 const10 const10 3 10 9 N 32769 0 63
def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
def test t5 t5 const11 const11 3 4 4 Y 32768 0 63
def test t5 t5 const11 const11 3 4 4 Y 32768 0 63
...
@@ -1813,8 +1813,8 @@ def test t5 t5 param11 param11 8 20 4 Y 32768 0 63
...
@@ -1813,8 +1813,8 @@ def test t5 t5 param11 param11 8 20 4 Y 32768 0 63
def test t5 t5 const12 const12 254 0 0 Y 128 0 63
def test t5 t5 const12 const12 254 0 0 Y 128 0 63
def test t5 t5 param12 param12 8 20 0 Y 32768 0 63
def test t5 t5 param12 param12 8 20 0 Y 32768 0 63
def test t5 t5 param13 param13 5 20 0 Y 32768 31 63
def test t5 t5 param13 param13 5 20 0 Y 32768 31 63
def test t5 t5 param14 param14 252
1677721
5 0 Y 16 0 8
def test t5 t5 param14 param14 252
429496729
5 0 Y 16 0 8
def test t5 t5 param15 param15 252
1677721
5 0 Y 144 0 63
def test t5 t5 param15 param15 252
429496729
5 0 Y 144 0 63
const01 8
const01 8
param01 8
param01 8
const02 8.0
const02 8.0
...
...
sql/field.cc
View file @
eb4a309b
...
@@ -47,6 +47,8 @@ uchar Field_null::null[1]={1};
...
@@ -47,6 +47,8 @@ uchar Field_null::null[1]={1};
const
char
field_separator
=
','
;
const
char
field_separator
=
','
;
#define DOUBLE_TO_STRING_CONVERSION_BUFFER_SIZE 320
#define DOUBLE_TO_STRING_CONVERSION_BUFFER_SIZE 320
#define BLOB_PACK_LENGTH_TO_MAX_LENGH(arg) \
((ulong) ((LL(1) << min(arg, 4) * 8) - LL(1)))
/*
/*
Rules for merging different types of fields in UNION
Rules for merging different types of fields in UNION
...
@@ -5445,7 +5447,7 @@ Field_blob::Field_blob(char *ptr_arg, uchar *null_ptr_arg, uchar null_bit_arg,
...
@@ -5445,7 +5447,7 @@ Field_blob::Field_blob(char *ptr_arg, uchar *null_ptr_arg, uchar null_bit_arg,
enum
utype
unireg_check_arg
,
const
char
*
field_name_arg
,
enum
utype
unireg_check_arg
,
const
char
*
field_name_arg
,
struct
st_table
*
table_arg
,
uint
blob_pack_length
,
struct
st_table
*
table_arg
,
uint
blob_pack_length
,
CHARSET_INFO
*
cs
)
CHARSET_INFO
*
cs
)
:
Field_str
(
ptr_arg
,
(
1L
<<
min
(
blob_pack_length
,
3
)
*
8
)
-
1L
,
:
Field_str
(
ptr_arg
,
BLOB_PACK_LENGTH_TO_MAX_LENGH
(
blob_pack_length
)
,
null_ptr_arg
,
null_bit_arg
,
unireg_check_arg
,
field_name_arg
,
null_ptr_arg
,
null_bit_arg
,
unireg_check_arg
,
field_name_arg
,
table_arg
,
cs
),
table_arg
,
cs
),
packlength
(
blob_pack_length
)
packlength
(
blob_pack_length
)
...
...
tests/mysql_client_test.c
View file @
eb4a309b
...
@@ -672,7 +672,7 @@ static void verify_prepare_field(MYSQL_RES *result,
...
@@ -672,7 +672,7 @@ static void verify_prepare_field(MYSQL_RES *result,
fprintf
(
stdout
,
"
\n
org_table:`%s`
\t
(expected: `%s`)"
,
fprintf
(
stdout
,
"
\n
org_table:`%s`
\t
(expected: `%s`)"
,
field
->
org_table
,
org_table
);
field
->
org_table
,
org_table
);
fprintf
(
stdout
,
"
\n
database :`%s`
\t
(expected: `%s`)"
,
field
->
db
,
db
);
fprintf
(
stdout
,
"
\n
database :`%s`
\t
(expected: `%s`)"
,
field
->
db
,
db
);
fprintf
(
stdout
,
"
\n
length :`%l
d`
\t
(expected: `%ld
`)"
,
fprintf
(
stdout
,
"
\n
length :`%l
u`
\t
(expected: `%lu
`)"
,
field
->
length
,
length
*
cs
->
mbmaxlen
);
field
->
length
,
length
*
cs
->
mbmaxlen
);
fprintf
(
stdout
,
"
\n
maxlength:`%ld`"
,
field
->
max_length
);
fprintf
(
stdout
,
"
\n
maxlength:`%ld`"
,
field
->
max_length
);
fprintf
(
stdout
,
"
\n
charsetnr:`%d`"
,
field
->
charsetnr
);
fprintf
(
stdout
,
"
\n
charsetnr:`%d`"
,
field
->
charsetnr
);
...
@@ -11670,6 +11670,34 @@ static void test_bug8378()
...
@@ -11670,6 +11670,34 @@ static void test_bug8378()
#endif
#endif
}
}
/* Test correct max length for MEDIUMTEXT and LONGTEXT columns */
static
void
test_bug9735
()
{
MYSQL_RES
*
res
;
int
rc
;
myheader
(
"test_bug9735"
);
rc
=
mysql_query
(
mysql
,
"drop table if exists t1"
);
myquery
(
rc
);
rc
=
mysql_query
(
mysql
,
"create table t1 (a mediumtext, b longtext) "
"character set latin1"
);
myquery
(
rc
);
rc
=
mysql_query
(
mysql
,
"select * from t1"
);
myquery
(
rc
);
res
=
mysql_store_result
(
mysql
);
verify_prepare_field
(
res
,
0
,
"a"
,
"a"
,
MYSQL_TYPE_BLOB
,
"t1"
,
"t1"
,
current_db
,
(
1U
<<
24
)
-
1
,
0
);
verify_prepare_field
(
res
,
1
,
"b"
,
"b"
,
MYSQL_TYPE_BLOB
,
"t1"
,
"t1"
,
current_db
,
~
0U
,
0
);
mysql_free_result
(
res
);
rc
=
mysql_query
(
mysql
,
"drop table t1"
);
myquery
(
rc
);
}
/*
/*
Read and parse arguments and MySQL options from my.cnf
Read and parse arguments and MySQL options from my.cnf
*/
*/
...
@@ -11884,6 +11912,7 @@ static struct my_tests_st my_tests[]= {
...
@@ -11884,6 +11912,7 @@ static struct my_tests_st my_tests[]= {
{
"test_bug8330"
,
test_bug8330
},
{
"test_bug8330"
,
test_bug8330
},
{
"test_bug7990"
,
test_bug7990
},
{
"test_bug7990"
,
test_bug7990
},
{
"test_bug8378"
,
test_bug8378
},
{
"test_bug8378"
,
test_bug8378
},
{
"test_bug9735"
,
test_bug9735
},
{
0
,
0
}
{
0
,
0
}
};
};
...
...
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