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
1a391f71
Commit
1a391f71
authored
Nov 28, 2005
by
jimw@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
parents
fc1ee24f
5f7e5b46
Changes
13
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
72 additions
and
16 deletions
+72
-16
client/mysqladmin.cc
client/mysqladmin.cc
+1
-1
client/mysqlbinlog.cc
client/mysqlbinlog.cc
+2
-2
client/mysqlcheck.c
client/mysqlcheck.c
+1
-1
client/mysqldump.c
client/mysqldump.c
+1
-1
client/mysqlimport.c
client/mysqlimport.c
+1
-1
client/mysqlshow.c
client/mysqlshow.c
+1
-1
client/mysqltest.c
client/mysqltest.c
+1
-1
mysql-test/r/create.result
mysql-test/r/create.result
+19
-0
mysql-test/r/ps.result
mysql-test/r/ps.result
+7
-0
mysql-test/t/create.test
mysql-test/t/create.test
+14
-0
mysql-test/t/ps.test
mysql-test/t/ps.test
+12
-0
sql/sql_parse.cc
sql/sql_parse.cc
+8
-4
sql/table.cc
sql/table.cc
+4
-4
No files found.
client/mysqladmin.cc
View file @
1a391f71
...
@@ -161,7 +161,7 @@ static struct my_option my_long_options[] =
...
@@ -161,7 +161,7 @@ static struct my_option my_long_options[] =
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
#endif
#endif
{
"port"
,
'P'
,
"Port number to use for connection."
,
(
gptr
*
)
&
tcp_port
,
{
"port"
,
'P'
,
"Port number to use for connection."
,
(
gptr
*
)
&
tcp_port
,
(
gptr
*
)
&
tcp_port
,
0
,
GET_UINT
,
REQUIRED_ARG
,
MYSQL_PORT
,
0
,
0
,
0
,
0
,
0
},
(
gptr
*
)
&
tcp_port
,
0
,
GET_UINT
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"protocol"
,
OPT_MYSQL_PROTOCOL
,
"The protocol of connection (tcp,socket,pipe,memory)."
,
{
"protocol"
,
OPT_MYSQL_PROTOCOL
,
"The protocol of connection (tcp,socket,pipe,memory)."
,
0
,
0
,
0
,
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
0
,
0
,
0
,
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"relative"
,
'r'
,
{
"relative"
,
'r'
,
...
...
client/mysqlbinlog.cc
View file @
1a391f71
...
@@ -67,7 +67,7 @@ static const char* database= 0;
...
@@ -67,7 +67,7 @@ static const char* database= 0;
static
my_bool
force_opt
=
0
,
short_form
=
0
,
remote_opt
=
0
;
static
my_bool
force_opt
=
0
,
short_form
=
0
,
remote_opt
=
0
;
static
ulonglong
offset
=
0
;
static
ulonglong
offset
=
0
;
static
const
char
*
host
=
0
;
static
const
char
*
host
=
0
;
static
int
port
=
MYSQL_PORT
;
static
int
port
=
0
;
static
const
char
*
sock
=
0
;
static
const
char
*
sock
=
0
;
static
const
char
*
user
=
0
;
static
const
char
*
user
=
0
;
static
char
*
pass
=
0
;
static
char
*
pass
=
0
;
...
@@ -688,7 +688,7 @@ static struct my_option my_long_options[] =
...
@@ -688,7 +688,7 @@ static struct my_option my_long_options[] =
{
"password"
,
'p'
,
"Password to connect to remote server."
,
{
"password"
,
'p'
,
"Password to connect to remote server."
,
0
,
0
,
0
,
GET_STR
,
OPT_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
0
,
0
,
0
,
GET_STR
,
OPT_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"port"
,
'P'
,
"Use port to connect to the remote server."
,
{
"port"
,
'P'
,
"Use port to connect to the remote server."
,
(
gptr
*
)
&
port
,
(
gptr
*
)
&
port
,
0
,
GET_INT
,
REQUIRED_ARG
,
MYSQL_PORT
,
0
,
0
,
(
gptr
*
)
&
port
,
(
gptr
*
)
&
port
,
0
,
GET_INT
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
0
,
0
,
0
},
{
"position"
,
'j'
,
"Deprecated. Use --start-position instead."
,
{
"position"
,
'j'
,
"Deprecated. Use --start-position instead."
,
(
gptr
*
)
&
start_position
,
(
gptr
*
)
&
start_position
,
0
,
GET_ULL
,
(
gptr
*
)
&
start_position
,
(
gptr
*
)
&
start_position
,
0
,
GET_ULL
,
...
...
client/mysqlcheck.c
View file @
1a391f71
...
@@ -122,7 +122,7 @@ static struct my_option my_long_options[] =
...
@@ -122,7 +122,7 @@ static struct my_option my_long_options[] =
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
#endif
#endif
{
"port"
,
'P'
,
"Port number to use for connection."
,
(
gptr
*
)
&
opt_mysql_port
,
{
"port"
,
'P'
,
"Port number to use for connection."
,
(
gptr
*
)
&
opt_mysql_port
,
(
gptr
*
)
&
opt_mysql_port
,
0
,
GET_UINT
,
REQUIRED_ARG
,
MYSQL_PORT
,
0
,
0
,
0
,
0
,
(
gptr
*
)
&
opt_mysql_port
,
0
,
GET_UINT
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
0
},
{
"protocol"
,
OPT_MYSQL_PROTOCOL
,
"The protocol of connection (tcp,socket,pipe,memory)."
,
{
"protocol"
,
OPT_MYSQL_PROTOCOL
,
"The protocol of connection (tcp,socket,pipe,memory)."
,
0
,
0
,
0
,
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
0
,
0
,
0
,
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
...
...
client/mysqldump.c
View file @
1a391f71
...
@@ -330,7 +330,7 @@ static struct my_option my_long_options[] =
...
@@ -330,7 +330,7 @@ static struct my_option my_long_options[] =
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
#endif
#endif
{
"port"
,
'P'
,
"Port number to use for connection."
,
(
gptr
*
)
&
opt_mysql_port
,
{
"port"
,
'P'
,
"Port number to use for connection."
,
(
gptr
*
)
&
opt_mysql_port
,
(
gptr
*
)
&
opt_mysql_port
,
0
,
GET_UINT
,
REQUIRED_ARG
,
MYSQL_PORT
,
0
,
0
,
0
,
0
,
(
gptr
*
)
&
opt_mysql_port
,
0
,
GET_UINT
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
0
},
{
"protocol"
,
OPT_MYSQL_PROTOCOL
,
"The protocol of connection (tcp,socket,pipe,memory)."
,
{
"protocol"
,
OPT_MYSQL_PROTOCOL
,
"The protocol of connection (tcp,socket,pipe,memory)."
,
0
,
0
,
0
,
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
0
,
0
,
0
,
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
...
...
client/mysqlimport.c
View file @
1a391f71
...
@@ -121,7 +121,7 @@ static struct my_option my_long_options[] =
...
@@ -121,7 +121,7 @@ static struct my_option my_long_options[] =
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
#endif
#endif
{
"port"
,
'P'
,
"Port number to use for connection."
,
(
gptr
*
)
&
opt_mysql_port
,
{
"port"
,
'P'
,
"Port number to use for connection."
,
(
gptr
*
)
&
opt_mysql_port
,
(
gptr
*
)
&
opt_mysql_port
,
0
,
GET_UINT
,
REQUIRED_ARG
,
MYSQL_PORT
,
0
,
0
,
0
,
0
,
(
gptr
*
)
&
opt_mysql_port
,
0
,
GET_UINT
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
0
},
{
"protocol"
,
OPT_MYSQL_PROTOCOL
,
"The protocol of connection (tcp,socket,pipe,memory)."
,
{
"protocol"
,
OPT_MYSQL_PROTOCOL
,
"The protocol of connection (tcp,socket,pipe,memory)."
,
0
,
0
,
0
,
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
0
,
0
,
0
,
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
...
...
client/mysqlshow.c
View file @
1a391f71
...
@@ -188,7 +188,7 @@ static struct my_option my_long_options[] =
...
@@ -188,7 +188,7 @@ static struct my_option my_long_options[] =
"Password to use when connecting to server. If password is not given it's asked from the tty."
,
"Password to use when connecting to server. If password is not given it's asked from the tty."
,
0
,
0
,
0
,
GET_STR
,
OPT_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
0
,
0
,
0
,
GET_STR
,
OPT_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"port"
,
'P'
,
"Port number to use for connection."
,
(
gptr
*
)
&
opt_mysql_port
,
{
"port"
,
'P'
,
"Port number to use for connection."
,
(
gptr
*
)
&
opt_mysql_port
,
(
gptr
*
)
&
opt_mysql_port
,
0
,
GET_UINT
,
REQUIRED_ARG
,
MYSQL_PORT
,
0
,
0
,
0
,
0
,
(
gptr
*
)
&
opt_mysql_port
,
0
,
GET_UINT
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
0
},
#ifdef __WIN__
#ifdef __WIN__
{
"pipe"
,
'W'
,
"Use named pipes to connect to server."
,
0
,
0
,
0
,
GET_NO_ARG
,
{
"pipe"
,
'W'
,
"Use named pipes to connect to server."
,
0
,
0
,
0
,
GET_NO_ARG
,
...
...
client/mysqltest.c
View file @
1a391f71
...
@@ -2763,7 +2763,7 @@ static struct my_option my_long_options[] =
...
@@ -2763,7 +2763,7 @@ static struct my_option my_long_options[] =
{
"password"
,
'p'
,
"Password to use when connecting to server."
,
{
"password"
,
'p'
,
"Password to use when connecting to server."
,
0
,
0
,
0
,
GET_STR
,
OPT_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
0
,
0
,
0
,
GET_STR
,
OPT_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"port"
,
'P'
,
"Port number to use for connection."
,
(
gptr
*
)
&
port
,
{
"port"
,
'P'
,
"Port number to use for connection."
,
(
gptr
*
)
&
port
,
(
gptr
*
)
&
port
,
0
,
GET_INT
,
REQUIRED_ARG
,
MYSQL_PORT
,
0
,
0
,
0
,
0
,
0
},
(
gptr
*
)
&
port
,
0
,
GET_INT
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"ps-protocol"
,
OPT_PS_PROTOCOL
,
"Use prepared statements protocol for communication"
,
{
"ps-protocol"
,
OPT_PS_PROTOCOL
,
"Use prepared statements protocol for communication"
,
(
gptr
*
)
&
ps_protocol
,
(
gptr
*
)
&
ps_protocol
,
0
,
(
gptr
*
)
&
ps_protocol
,
(
gptr
*
)
&
ps_protocol
,
0
,
GET_BOOL
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
GET_BOOL
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
...
...
mysql-test/r/create.result
View file @
1a391f71
...
@@ -743,3 +743,22 @@ t2 CREATE TABLE `t2` (
...
@@ -743,3 +743,22 @@ t2 CREATE TABLE `t2` (
`a2` int(11) default NULL
`a2` int(11) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1, t2;
drop table t1, t2;
create table t1 (i int) engine=myisam max_rows=100000000000;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`i` int(11) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 MAX_ROWS=4294967295
alter table t1 max_rows=100;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`i` int(11) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 MAX_ROWS=100
alter table t1 max_rows=100000000000;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`i` int(11) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 MAX_ROWS=4294967295
drop table t1;
mysql-test/r/ps.result
View file @
1a391f71
...
@@ -825,3 +825,10 @@ execute stmt;
...
@@ -825,3 +825,10 @@ execute stmt;
drop table t1;
drop table t1;
set names default;
set names default;
deallocate prepare stmt;
deallocate prepare stmt;
create table t1 (id int);
prepare ins_call from "insert into t1 (id) values (1)";
execute ins_call;
select row_count();
row_count()
1
drop table t1;
mysql-test/t/create.test
View file @
1a391f71
...
@@ -631,3 +631,17 @@ show create table t2;
...
@@ -631,3 +631,17 @@ show create table t2;
drop
table
t1
,
t2
;
drop
table
t1
,
t2
;
# End of 4.1 tests
# End of 4.1 tests
#
# Bug #14155: Maximum value of MAX_ROWS handled incorrectly on 64-bit
# platforms
#
create
table
t1
(
i
int
)
engine
=
myisam
max_rows
=
100000000000
;
show
create
table
t1
;
alter
table
t1
max_rows
=
100
;
show
create
table
t1
;
alter
table
t1
max_rows
=
100000000000
;
show
create
table
t1
;
drop
table
t1
;
# End of 5.0 tests
mysql-test/t/ps.test
View file @
1a391f71
...
@@ -871,3 +871,15 @@ set names default;
...
@@ -871,3 +871,15 @@ set names default;
deallocate
prepare
stmt
;
deallocate
prepare
stmt
;
# End of 4.1 tests
# End of 4.1 tests
#
# Bug #14956: ROW_COUNT() returns incorrect result after EXECUTE of prepared
# statement
#
create
table
t1
(
id
int
);
prepare
ins_call
from
"insert into t1 (id) values (1)"
;
execute
ins_call
;
select
row_count
();
drop
table
t1
;
# End of 5.0 tests
sql/sql_parse.cc
View file @
1a391f71
...
@@ -4844,11 +4844,15 @@ mysql_execute_command(THD *thd)
...
@@ -4844,11 +4844,15 @@ mysql_execute_command(THD *thd)
/*
/*
The return value for ROW_COUNT() is "implementation dependent" if
The return value for ROW_COUNT() is "implementation dependent" if the
the statement is not DELETE, INSERT or UPDATE (or a CALL executing
statement is not DELETE, INSERT or UPDATE, but -1 is what JDBC and ODBC
such a statement), but -1 is what JDBC and ODBC wants.
wants.
We do not change the value for a CALL or EXECUTE statement, so the value
generated by the last called (or executed) statement is preserved.
*/
*/
if
(
lex
->
sql_command
!=
SQLCOM_CALL
&&
uc_update_queries
[
lex
->
sql_command
]
<
2
)
if
(
lex
->
sql_command
!=
SQLCOM_CALL
&&
lex
->
sql_command
!=
SQLCOM_EXECUTE
&&
uc_update_queries
[
lex
->
sql_command
]
<
2
)
thd
->
row_count_func
=
-
1
;
thd
->
row_count_func
=
-
1
;
goto
cleanup
;
goto
cleanup
;
...
...
sql/table.cc
View file @
1a391f71
...
@@ -1405,10 +1405,10 @@ File create_frm(THD *thd, my_string name, const char *db,
...
@@ -1405,10 +1405,10 @@ File create_frm(THD *thd, my_string name, const char *db,
#if SIZEOF_OFF_T > 4
#if SIZEOF_OFF_T > 4
/* Fix this when we have new .frm files; Current limit is 4G rows (QQ) */
/* Fix this when we have new .frm files; Current limit is 4G rows (QQ) */
if
(
create_info
->
max_rows
>
~
(
ulong
)
0
)
if
(
create_info
->
max_rows
>
UINT_MAX32
)
create_info
->
max_rows
=
~
(
ulong
)
0
;
create_info
->
max_rows
=
UINT_MAX32
;
if
(
create_info
->
min_rows
>
~
(
ulong
)
0
)
if
(
create_info
->
min_rows
>
UINT_MAX32
)
create_info
->
min_rows
=
~
(
ulong
)
0
;
create_info
->
min_rows
=
UINT_MAX32
;
#endif
#endif
/*
/*
Ensure that raid_chunks can't be larger than 255, as this would cause
Ensure that raid_chunks can't be larger than 255, as this would cause
...
...
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