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
0946b1d2
Commit
0946b1d2
authored
Feb 15, 2008
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
parents
e6a063cf
99933c18
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
256 additions
and
6 deletions
+256
-6
client/CMakeLists.txt
client/CMakeLists.txt
+2
-1
client/Makefile.am
client/Makefile.am
+2
-1
client/mysqltest.c
client/mysqltest.c
+136
-1
configure.in
configure.in
+2
-2
mysql-test/r/binlog.result
mysql-test/r/binlog.result
+15
-0
mysql-test/r/mysqltest.result
mysql-test/r/mysqltest.result
+3
-0
mysql-test/r/ps.result
mysql-test/r/ps.result
+16
-0
mysql-test/t/binlog.test
mysql-test/t/binlog.test
+17
-0
mysql-test/t/mysqltest.test
mysql-test/t/mysqltest.test
+41
-0
mysql-test/t/ps.test
mysql-test/t/ps.test
+17
-0
sql/item.cc
sql/item.cc
+5
-1
No files found.
client/CMakeLists.txt
View file @
0946b1d2
...
@@ -32,7 +32,8 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
...
@@ -32,7 +32,8 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
ADD_EXECUTABLE
(
mysql completion_hash.cc mysql.cc readline.cc sql_string.cc ../mysys/my_conio.c
)
ADD_EXECUTABLE
(
mysql completion_hash.cc mysql.cc readline.cc sql_string.cc ../mysys/my_conio.c
)
TARGET_LINK_LIBRARIES
(
mysql mysqlclient_notls wsock32
)
TARGET_LINK_LIBRARIES
(
mysql mysqlclient_notls wsock32
)
ADD_EXECUTABLE
(
mysqltest mysqltest.c ../mysys/my_getsystime.c ../mysys/my_copy.c
)
ADD_EXECUTABLE
(
mysqltest mysqltest.c ../mysys/my_getsystime.c
../mysys/my_copy.c ../mysys/my_mkdir.c
)
TARGET_LINK_LIBRARIES
(
mysqltest mysqlclient_notls regex wsock32
)
TARGET_LINK_LIBRARIES
(
mysqltest mysqlclient_notls regex wsock32
)
ADD_EXECUTABLE
(
mysqlcheck mysqlcheck.c
)
ADD_EXECUTABLE
(
mysqlcheck mysqlcheck.c
)
...
...
client/Makefile.am
View file @
0946b1d2
...
@@ -34,7 +34,8 @@ mysqladmin_SOURCES = mysqladmin.cc
...
@@ -34,7 +34,8 @@ mysqladmin_SOURCES = mysqladmin.cc
mysql_LDADD
=
@readline_link@ @TERMCAP_LIB@
$(LDADD)
$(CXXLDFLAGS)
mysql_LDADD
=
@readline_link@ @TERMCAP_LIB@
$(LDADD)
$(CXXLDFLAGS)
mysqltest_SOURCES
=
mysqltest.c
\
mysqltest_SOURCES
=
mysqltest.c
\
$(top_srcdir)
/mysys/my_getsystime.c
\
$(top_srcdir)
/mysys/my_getsystime.c
\
$(top_srcdir)
/mysys/my_copy.c
$(top_srcdir)
/mysys/my_copy.c
\
$(top_srcdir)
/mysys/my_mkdir.c
mysqltest_LDADD
=
$(top_builddir)
/regex/libregex.a
$(LDADD)
mysqltest_LDADD
=
$(top_builddir)
/regex/libregex.a
$(LDADD)
mysqlbinlog_SOURCES
=
mysqlbinlog.cc
\
mysqlbinlog_SOURCES
=
mysqlbinlog.cc
\
...
...
client/mysqltest.c
View file @
0946b1d2
...
@@ -51,6 +51,10 @@
...
@@ -51,6 +51,10 @@
#ifdef HAVE_SYS_WAIT_H
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
#include <sys/wait.h>
#endif
#endif
#ifdef __WIN__
#include <direct.h>
#endif
#ifndef WEXITSTATUS
#ifndef WEXITSTATUS
# ifdef __WIN__
# ifdef __WIN__
...
@@ -277,7 +281,7 @@ enum enum_commands {
...
@@ -277,7 +281,7 @@ enum enum_commands {
Q_REPLACE_REGEX
,
Q_REMOVE_FILE
,
Q_FILE_EXIST
,
Q_REPLACE_REGEX
,
Q_REMOVE_FILE
,
Q_FILE_EXIST
,
Q_WRITE_FILE
,
Q_COPY_FILE
,
Q_PERL
,
Q_DIE
,
Q_EXIT
,
Q_SKIP
,
Q_WRITE_FILE
,
Q_COPY_FILE
,
Q_PERL
,
Q_DIE
,
Q_EXIT
,
Q_SKIP
,
Q_CHMOD_FILE
,
Q_APPEND_FILE
,
Q_CAT_FILE
,
Q_DIFF_FILES
,
Q_CHMOD_FILE
,
Q_APPEND_FILE
,
Q_CAT_FILE
,
Q_DIFF_FILES
,
Q_SEND_QUIT
,
Q_SEND_QUIT
,
Q_CHANGE_USER
,
Q_MKDIR
,
Q_RMDIR
,
Q_UNKNOWN
,
/* Unknown command. */
Q_UNKNOWN
,
/* Unknown command. */
Q_COMMENT
,
/* Comments, ignored. */
Q_COMMENT
,
/* Comments, ignored. */
...
@@ -366,6 +370,10 @@ const char *command_names[]=
...
@@ -366,6 +370,10 @@ const char *command_names[]=
"cat_file"
,
"cat_file"
,
"diff_files"
,
"diff_files"
,
"send_quit"
,
"send_quit"
,
"change_user"
,
"mkdir"
,
"rmdir"
,
0
0
};
};
...
@@ -2741,6 +2749,67 @@ void do_file_exist(struct st_command *command)
...
@@ -2741,6 +2749,67 @@ void do_file_exist(struct st_command *command)
}
}
/*
SYNOPSIS
do_mkdir
command called command
DESCRIPTION
mkdir <dir_name>
Create the directory <dir_name>
*/
void
do_mkdir
(
struct
st_command
*
command
)
{
int
error
;
static
DYNAMIC_STRING
ds_dirname
;
const
struct
command_arg
mkdir_args
[]
=
{
"dirname"
,
ARG_STRING
,
TRUE
,
&
ds_dirname
,
"Directory to create"
};
DBUG_ENTER
(
"do_mkdir"
);
check_command_args
(
command
,
command
->
first_argument
,
mkdir_args
,
sizeof
(
mkdir_args
)
/
sizeof
(
struct
command_arg
),
' '
);
DBUG_PRINT
(
"info"
,
(
"creating directory: %s"
,
ds_dirname
.
str
));
error
=
my_mkdir
(
ds_dirname
.
str
,
0777
,
MYF
(
0
))
!=
0
;
handle_command_error
(
command
,
error
);
dynstr_free
(
&
ds_dirname
);
DBUG_VOID_RETURN
;
}
/*
SYNOPSIS
do_rmdir
command called command
DESCRIPTION
rmdir <dir_name>
Remove the empty directory <dir_name>
*/
void
do_rmdir
(
struct
st_command
*
command
)
{
int
error
;
static
DYNAMIC_STRING
ds_dirname
;
const
struct
command_arg
rmdir_args
[]
=
{
"dirname"
,
ARG_STRING
,
TRUE
,
&
ds_dirname
,
"Directory to remove"
};
DBUG_ENTER
(
"do_rmdir"
);
check_command_args
(
command
,
command
->
first_argument
,
rmdir_args
,
sizeof
(
rmdir_args
)
/
sizeof
(
struct
command_arg
),
' '
);
DBUG_PRINT
(
"info"
,
(
"removing directory: %s"
,
ds_dirname
.
str
));
error
=
rmdir
(
ds_dirname
.
str
)
!=
0
;
handle_command_error
(
command
,
error
);
dynstr_free
(
&
ds_dirname
);
DBUG_VOID_RETURN
;
}
/*
/*
Read characters from line buffer or file. This is needed to allow
Read characters from line buffer or file. This is needed to allow
my_ungetc() to buffer MAX_DELIMITER_LENGTH characters for a file
my_ungetc() to buffer MAX_DELIMITER_LENGTH characters for a file
...
@@ -3046,6 +3115,69 @@ void do_send_quit(struct st_command *command)
...
@@ -3046,6 +3115,69 @@ void do_send_quit(struct st_command *command)
}
}
/*
SYNOPSIS
do_change_user
command called command
DESCRIPTION
change_user [<user>], [<passwd>], [<db>]
<user> - user to change to
<passwd> - user password
<db> - default database
Changes the user and causes the database specified by db to become
the default (current) database for the the current connection.
*/
void
do_change_user
(
struct
st_command
*
command
)
{
MYSQL
*
mysql
=
&
cur_con
->
mysql
;
/* static keyword to make the NetWare compiler happy. */
static
DYNAMIC_STRING
ds_user
,
ds_passwd
,
ds_db
;
const
struct
command_arg
change_user_args
[]
=
{
{
"user"
,
ARG_STRING
,
FALSE
,
&
ds_user
,
"User to connect as"
},
{
"password"
,
ARG_STRING
,
FALSE
,
&
ds_passwd
,
"Password used when connecting"
},
{
"database"
,
ARG_STRING
,
FALSE
,
&
ds_db
,
"Database to select after connect"
},
};
DBUG_ENTER
(
"do_change_user"
);
check_command_args
(
command
,
command
->
first_argument
,
change_user_args
,
sizeof
(
change_user_args
)
/
sizeof
(
struct
command_arg
),
','
);
if
(
cur_con
->
stmt
)
{
mysql_stmt_close
(
cur_con
->
stmt
);
cur_con
->
stmt
=
NULL
;
}
if
(
!
ds_user
.
length
)
dynstr_set
(
&
ds_user
,
mysql
->
user
);
if
(
!
ds_passwd
.
length
)
dynstr_set
(
&
ds_passwd
,
mysql
->
passwd
);
if
(
!
ds_db
.
length
)
dynstr_set
(
&
ds_db
,
mysql
->
db
);
DBUG_PRINT
(
"info"
,(
"connection: '%s' user: '%s' password: '%s' database: '%s'"
,
cur_con
->
name
,
ds_user
.
str
,
ds_passwd
.
str
,
ds_db
.
str
));
if
(
mysql_change_user
(
mysql
,
ds_user
.
str
,
ds_passwd
.
str
,
ds_db
.
str
))
die
(
"change user failed: %s"
,
mysql_error
(
mysql
));
dynstr_free
(
&
ds_user
);
dynstr_free
(
&
ds_passwd
);
dynstr_free
(
&
ds_db
);
DBUG_VOID_RETURN
;
}
/*
/*
SYNOPSIS
SYNOPSIS
do_perl
do_perl
...
@@ -6847,11 +6979,14 @@ int main(int argc, char **argv)
...
@@ -6847,11 +6979,14 @@ int main(int argc, char **argv)
case
Q_ECHO
:
do_echo
(
command
);
command_executed
++
;
break
;
case
Q_ECHO
:
do_echo
(
command
);
command_executed
++
;
break
;
case
Q_SYSTEM
:
do_system
(
command
);
break
;
case
Q_SYSTEM
:
do_system
(
command
);
break
;
case
Q_REMOVE_FILE
:
do_remove_file
(
command
);
break
;
case
Q_REMOVE_FILE
:
do_remove_file
(
command
);
break
;
case
Q_MKDIR
:
do_mkdir
(
command
);
break
;
case
Q_RMDIR
:
do_rmdir
(
command
);
break
;
case
Q_FILE_EXIST
:
do_file_exist
(
command
);
break
;
case
Q_FILE_EXIST
:
do_file_exist
(
command
);
break
;
case
Q_WRITE_FILE
:
do_write_file
(
command
);
break
;
case
Q_WRITE_FILE
:
do_write_file
(
command
);
break
;
case
Q_APPEND_FILE
:
do_append_file
(
command
);
break
;
case
Q_APPEND_FILE
:
do_append_file
(
command
);
break
;
case
Q_DIFF_FILES
:
do_diff_files
(
command
);
break
;
case
Q_DIFF_FILES
:
do_diff_files
(
command
);
break
;
case
Q_SEND_QUIT
:
do_send_quit
(
command
);
break
;
case
Q_SEND_QUIT
:
do_send_quit
(
command
);
break
;
case
Q_CHANGE_USER
:
do_change_user
(
command
);
break
;
case
Q_CAT_FILE
:
do_cat_file
(
command
);
break
;
case
Q_CAT_FILE
:
do_cat_file
(
command
);
break
;
case
Q_COPY_FILE
:
do_copy_file
(
command
);
break
;
case
Q_COPY_FILE
:
do_copy_file
(
command
);
break
;
case
Q_CHMOD_FILE
:
do_chmod_file
(
command
);
break
;
case
Q_CHMOD_FILE
:
do_chmod_file
(
command
);
break
;
...
...
configure.in
View file @
0946b1d2
...
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
...
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
# The Docs Makefile.am parses this line!
# remember to also change ndb version below and update version.c in ndb
# remember to also change ndb version below and update version.c in ndb
AM_INIT_AUTOMAKE
(
mysql, 5.0.5
6
)
AM_INIT_AUTOMAKE
(
mysql, 5.0.5
8
)
AM_CONFIG_HEADER
([
include/config.h:config.h.in]
)
AM_CONFIG_HEADER
([
include/config.h:config.h.in]
)
PROTOCOL_VERSION
=
10
PROTOCOL_VERSION
=
10
...
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
...
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
# ndb version
# ndb version
NDB_VERSION_MAJOR
=
5
NDB_VERSION_MAJOR
=
5
NDB_VERSION_MINOR
=
0
NDB_VERSION_MINOR
=
0
NDB_VERSION_BUILD
=
5
6
NDB_VERSION_BUILD
=
5
8
NDB_VERSION_STATUS
=
""
NDB_VERSION_STATUS
=
""
# Set all version vars based on $VERSION. How do we do this more elegant ?
# Set all version vars based on $VERSION. How do we do this more elegant ?
...
...
mysql-test/r/binlog.result
View file @
0946b1d2
...
@@ -567,4 +567,19 @@ master-bin.000001 36585 Rotate 1 36629 master-bin.000002;pos=4
...
@@ -567,4 +567,19 @@ master-bin.000001 36585 Rotate 1 36629 master-bin.000002;pos=4
drop table t1;
drop table t1;
set global binlog_cache_size=@bcs;
set global binlog_cache_size=@bcs;
set session autocommit = @ac;
set session autocommit = @ac;
drop table if exists t1;
reset master;
create table t1 (a bigint unsigned, b bigint(20) unsigned);
prepare stmt from "insert into t1 values (?,?)";
set @a= 9999999999999999;
set @b= 14632475938453979136;
execute stmt using @a, @b;
deallocate prepare stmt;
drop table t1;
show binlog events from 0;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 98 Server version, Binlog ver: 4
master-bin.000001 98 Query 1 219 use `test`; create table t1 (a bigint unsigned, b bigint(20) unsigned)
master-bin.000001 219 Query 1 343 use `test`; insert into t1 values (9999999999999999,14632475938453979136)
master-bin.000001 343 Query 1 419 use `test`; drop table t1
End of 5.0 tests
End of 5.0 tests
mysql-test/r/mysqltest.result
View file @
0946b1d2
...
@@ -722,4 +722,7 @@ a int(11) YES NULL
...
@@ -722,4 +722,7 @@ a int(11) YES NULL
b varchar(255) YES NULL
b varchar(255) YES NULL
c datetime YES NULL
c datetime YES NULL
drop table t1;
drop table t1;
mysqltest: At line 1: change user failed: Unknown database 'inexistent'
mysqltest: At line 1: change user failed: Access denied for user 'inexistent'@'localhost' (using password: NO)
mysqltest: At line 1: change user failed: Access denied for user 'root'@'localhost' (using password: YES)
End of tests
End of tests
mysql-test/r/ps.result
View file @
0946b1d2
...
@@ -1693,4 +1693,20 @@ t1 CREATE TABLE `t1` (
...
@@ -1693,4 +1693,20 @@ t1 CREATE TABLE `t1` (
`?` decimal(2,1) default NULL
`?` decimal(2,1) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
drop table t1;
drop table if exists t1;
create table t1 (a bigint unsigned, b bigint(20) unsigned);
prepare stmt from "insert into t1 values (?,?)";
set @a= 9999999999999999;
set @b= 14632475938453979136;
insert into t1 values (@a, @b);
select * from t1 where a = @a and b = @b;
a b
9999999999999999 14632475938453979136
execute stmt using @a, @b;
select * from t1 where a = @a and b = @b;
a b
9999999999999999 14632475938453979136
9999999999999999 14632475938453979136
deallocate prepare stmt;
drop table t1;
End of 5.0 tests.
End of 5.0 tests.
mysql-test/t/binlog.test
View file @
0946b1d2
...
@@ -106,4 +106,21 @@ drop table t1;
...
@@ -106,4 +106,21 @@ drop table t1;
set
global
binlog_cache_size
=@
bcs
;
set
global
binlog_cache_size
=@
bcs
;
set
session
autocommit
=
@
ac
;
set
session
autocommit
=
@
ac
;
#
# Bug#33798: prepared statements improperly handle large unsigned ints
#
--
disable_warnings
drop
table
if
exists
t1
;
--
enable_warnings
reset
master
;
create
table
t1
(
a
bigint
unsigned
,
b
bigint
(
20
)
unsigned
);
prepare
stmt
from
"insert into t1 values (?,?)"
;
set
@
a
=
9999999999999999
;
set
@
b
=
14632475938453979136
;
execute
stmt
using
@
a
,
@
b
;
deallocate
prepare
stmt
;
drop
table
t1
;
--
replace_regex
/
\
/
\
*
xid
=.*
\
*
\
//\/* XID *\// /table_id: [0-9]+/table_id: #/ /Server ver: [^,]*,/Server version,/
show
binlog
events
from
0
;
--
echo
End
of
5.0
tests
--
echo
End
of
5.0
tests
mysql-test/t/mysqltest.test
View file @
0946b1d2
...
@@ -2083,5 +2083,46 @@ eval $show_statement;
...
@@ -2083,5 +2083,46 @@ eval $show_statement;
drop
table
t1
;
drop
table
t1
;
# ----------------------------------------------------------------------------
# Test change_user command
# ----------------------------------------------------------------------------
--
error
1
--
exec
echo
"--change_user root,,inexistent"
|
$MYSQL_TEST
2
>&
1
--
error
1
--
exec
echo
"--change_user inexistent,,test"
|
$MYSQL_TEST
2
>&
1
--
error
1
--
exec
echo
"--change_user root,inexistent,test"
|
$MYSQL_TEST
2
>&
1
--
change_user
--
change_user
root
--
change_user
root
,,
--
change_user
root
,,
test
# ----------------------------------------------------------------------------
# Test mkdir and rmdir command
# ----------------------------------------------------------------------------
mkdir
$MYSQLTEST_VARDIR
/
tmp
/
testdir
;
rmdir
$MYSQLTEST_VARDIR
/
tmp
/
testdir
;
# Directory already exist
mkdir
$MYSQLTEST_VARDIR
/
tmp
/
testdir
;
--
error
1
mkdir
$MYSQLTEST_VARDIR
/
tmp
/
testdir
;
# Remove dir with file inside
write_file
$MYSQLTEST_VARDIR
/
tmp
/
testdir
/
file1
.
txt
;
hello
EOF
--
error
1
rmdir
$MYSQLTEST_VARDIR
/
tmp
/
testdir
;
remove_file
$MYSQLTEST_VARDIR
/
tmp
/
testdir
/
file1
.
txt
;
rmdir
$MYSQLTEST_VARDIR
/
tmp
/
testdir
;
--
echo
End
of
tests
--
echo
End
of
tests
mysql-test/t/ps.test
View file @
0946b1d2
...
@@ -1807,4 +1807,21 @@ execute stmt using @a;
...
@@ -1807,4 +1807,21 @@ execute stmt using @a;
show
create
table
t1
;
show
create
table
t1
;
drop
table
t1
;
drop
table
t1
;
#
# Bug#33798: prepared statements improperly handle large unsigned ints
#
--
disable_warnings
drop
table
if
exists
t1
;
--
enable_warnings
create
table
t1
(
a
bigint
unsigned
,
b
bigint
(
20
)
unsigned
);
prepare
stmt
from
"insert into t1 values (?,?)"
;
set
@
a
=
9999999999999999
;
set
@
b
=
14632475938453979136
;
insert
into
t1
values
(
@
a
,
@
b
);
select
*
from
t1
where
a
=
@
a
and
b
=
@
b
;
execute
stmt
using
@
a
,
@
b
;
select
*
from
t1
where
a
=
@
a
and
b
=
@
b
;
deallocate
prepare
stmt
;
drop
table
t1
;
--
echo
End
of
5.0
tests
.
--
echo
End
of
5.0
tests
.
sql/item.cc
View file @
0946b1d2
...
@@ -2580,6 +2580,7 @@ bool Item_param::set_from_user_var(THD *thd, const user_var_entry *entry)
...
@@ -2580,6 +2580,7 @@ bool Item_param::set_from_user_var(THD *thd, const user_var_entry *entry)
if
(
entry
&&
entry
->
value
)
if
(
entry
&&
entry
->
value
)
{
{
item_result_type
=
entry
->
type
;
item_result_type
=
entry
->
type
;
unsigned_flag
=
entry
->
unsigned_flag
;
if
(
strict_type
&&
required_result_type
!=
item_result_type
)
if
(
strict_type
&&
required_result_type
!=
item_result_type
)
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
switch
(
item_result_type
)
{
switch
(
item_result_type
)
{
...
@@ -2875,6 +2876,9 @@ const String *Item_param::query_val_str(String* str) const
...
@@ -2875,6 +2876,9 @@ const String *Item_param::query_val_str(String* str) const
{
{
switch
(
state
)
{
switch
(
state
)
{
case
INT_VALUE
:
case
INT_VALUE
:
if
(
unsigned_flag
)
str
->
set
((
ulonglong
)
value
.
integer
,
&
my_charset_bin
);
else
str
->
set
(
value
.
integer
,
&
my_charset_bin
);
str
->
set
(
value
.
integer
,
&
my_charset_bin
);
break
;
break
;
case
REAL_VALUE
:
case
REAL_VALUE
:
...
...
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