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
4ece8ae4
Commit
4ece8ae4
authored
Feb 02, 2005
by
joreland@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
parents
f06452fb
7213ca46
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
75 additions
and
47 deletions
+75
-47
Build-tools/Bootstrap
Build-tools/Bootstrap
+1
-1
Build-tools/Do-compile
Build-tools/Do-compile
+18
-8
client/mysqladmin.cc
client/mysqladmin.cc
+1
-0
configure.in
configure.in
+2
-2
mysql-test/r/func_str.result
mysql-test/r/func_str.result
+13
-6
mysql-test/t/func_str.test
mysql-test/t/func_str.test
+12
-6
scripts/make_binary_distribution.sh
scripts/make_binary_distribution.sh
+8
-4
sql/item_strfunc.cc
sql/item_strfunc.cc
+6
-11
sql/item_strfunc.h
sql/item_strfunc.h
+1
-0
sql/mysqld.cc
sql/mysqld.cc
+2
-0
sql/sql_parse.cc
sql/sql_parse.cc
+2
-1
sql/sql_update.cc
sql/sql_update.cc
+7
-6
vio/viosocket.c
vio/viosocket.c
+1
-1
vio/viossl.c
vio/viossl.c
+1
-1
No files found.
Build-tools/Bootstrap
View file @
4ece8ae4
...
...
@@ -214,7 +214,7 @@ if (-d $target_dir)
@stat
=
stat
("
$target_dir
/configure.in
");
my
$mtime
=
$stat
[
9
];
my
(
$sec
,
$min
,
$hour
,
$mday
,
$mon
,
$year
)
=
localtime
(
$mtime
);
my
$mtime
=
sprintf
("
%04d
%-
02d-%02d-%02d:%02d
",
$year
+
1900
,
$mon
+
1
,
$mday
,
$hour
,
$min
);
my
$mtime
=
sprintf
("
%04d
-%
02d-%02d-%02d:%02d
",
$year
+
1900
,
$mon
+
1
,
$mday
,
$hour
,
$min
);
&
logger
("
Renaming
$target_dir
to
$target_dir
-
$mtime
");
$command
=
"
mv
";
...
...
Build-tools/Do-compile
View file @
4ece8ae4
...
...
@@ -7,7 +7,7 @@ use Sys::Hostname;
@config_options
=
();
@make_options
=
();
$opt_distribution
=
$opt_user
=
$opt_config_env
=
$opt_config_extra_env
=
"";
$opt_
comment
=
$opt_
distribution
=
$opt_user
=
$opt_config_env
=
$opt_config_extra_env
=
"";
$opt_dbd_options
=
$opt_perl_options
=
$opt_config_options
=
$opt_make_options
=
$opt_suffix
=
"";
$opt_tmp
=
$opt_version_suffix
=
"";
$opt_bundled_zlib
=
$opt_help
=
$opt_delete
=
$opt_debug
=
$opt_stage
=
$opt_no_test
=
$opt_no_perl
=
$opt_one_error
=
$opt_with_low_memory
=
$opt_fast_benchmark
=
$opt_static_client
=
$opt_static_server
=
$opt_static_perl
=
$opt_sur
=
$opt_with_small_disk
=
$opt_local_perl
=
$opt_tcpip
=
$opt_build_thread
=
$opt_use_old_distribution
=
$opt_enable_shared
=
$opt_no_crash_me
=
$opt_no_strip
=
$opt_with_archive
=
$opt_with_cluster
=
$opt_with_csv
=
$opt_with_example
=
$opt_with_debug
=
$opt_no_benchmark
=
$opt_no_mysqltest
=
$opt_without_embedded
=
$opt_readline
=
0
;
...
...
@@ -17,6 +17,7 @@ GetOptions(
"
bdb
",
"
build-thread=i
",
"
bundled-zlib
",
"
comment=s
",
"
config-env=s
"
=>
\
@config_env
,
"
config-extra-env=s
"
=>
\
@config_extra_env
,
"
config-options=s
"
=>
\
@config_options
,
...
...
@@ -110,6 +111,7 @@ $log="$pwd/Logs/$host-$major.$minor$opt_version_suffix.log";
$opt_distribution
=~
/(mysql[^\/]*)\.tar/
;
$ver
=
$1
;
$gcc_version
=
which
("
gcc
");
$opt_comment
=
"
Official MySQL
$opt_version_suffix
binary
"
unless
$opt_comment
;
if
(
defined
(
$gcc_version
)
&&
!
$opt_config_env
)
{
$tmp
=
`
$gcc_version
-v 2>&1
`;
...
...
@@ -303,7 +305,7 @@ if ($opt_stage <= 1)
}
$prefix
=
"
/usr/local/mysql
";
check_system
("
$opt_config_env
./configure --prefix=
$prefix
--localstatedir=
$prefix
/data --libexecdir=
$prefix
/bin --with-comment=
\"
Official MySQL
$opt_version_suffix
binary
\"
--with-extra-charsets=complex --with-server-suffix=
\"
$opt_version_suffix
\"
--enable-thread-safe-client --enable-local-infile
$opt_config_options
","
Thank you for choosing MySQL
");
check_system
("
$opt_config_env
./configure --prefix=
$prefix
--localstatedir=
$prefix
/data --libexecdir=
$prefix
/bin --with-comment=
\"
$opt_comment
\"
--with-extra-charsets=complex --with-server-suffix=
\"
$opt_version_suffix
\"
--enable-thread-safe-client --enable-local-infile
$opt_config_options
","
Thank you for choosing MySQL
");
if
(
-
d
"
$pwd
/
$host
/include-mysql
")
{
safe_system
("
cp -r
$pwd
/
$host
/include-mysql/*
$pwd
/
$host
/
$ver
/include
");
...
...
@@ -530,6 +532,10 @@ When running several Do-compile runs in parallel, each build
should have its own thread ID, so running the test suites
does not cause conflicts with duplicate TCP port numbers.
--comment=<comment>
Replace the default compilation comment that is embedded into
the mysqld binary.
--config-env=<environment for configure>
To set up the environment, like 'CC=cc CXX=gcc CXXFLAGS=-O3'
...
...
@@ -684,16 +690,20 @@ sub abort
if
(
$opt_user
)
{
$mail_header_file
=
"
$opt_tmp
/do-command.$$
";
open
(
TMP
,"
>
$mail_header_file
");
# Take the last 40 lines of the build log
open
(
LOG
,
"
$log
")
or
die
$!
;
my
@log
=
<
LOG
>
;
close
LOG
;
splice
@log
=>
0
,
-
40
;
my
$mail_file
=
"
$opt_tmp
/do-command.$$
";
open
(
TMP
,"
>
$mail_file
")
or
die
$!
;
print
TMP
"
From: mysqldev
\
@
$full_host_name
\n
";
print
TMP
"
To:
$email
\n
";
print
TMP
"
Subject:
$host
(
$uname
):
$ver$opt_version_suffix
compilation failed
\n\n
";
print
TMP
@log
;
close
TMP
;
system
("
tail -n 40
$log
>
$log
.mail
");
system
("
cat
$mail_header_file
$log
.mail |
$sendmail
-t -f
$email
");
unlink
(
$mail_header_file
);
unlink
("
$log
.mail
");
system
("
$sendmail
-t -f
$email
<
$mail_file
");
unlink
(
$mail_file
);
}
exit
1
;
}
...
...
client/mysqladmin.cc
View file @
4ece8ae4
...
...
@@ -1008,6 +1008,7 @@ static void usage(void)
print_defaults
(
"my"
,
load_default_groups
);
puts
(
"
\n
Where command is a one or more of: (Commands may be shortened)
\n
\
create databasename Create a new database
\n
\
debug Instruct server to write debug information to log
\n
\
drop databasename Delete a database and all its tables
\n
\
extended-status Gives an extended status message from the server
\n
\
flush-hosts Flush all cached hosts
\n
\
...
...
configure.in
View file @
4ece8ae4
...
...
@@ -1677,8 +1677,8 @@ then
elif test "
$with_debug
" = "
full
"
then
# Full debug. Very slow in some cases
CFLAGS="
$DEBUG_CFLAGS
-DDBUG_ON
-DSAFE_MUTEX
-DSAFEMALLOC
-DUNIV_DEBUG
$CFLAGS
"
CXXFLAGS="
$DEBUG_CXXFLAGS
-DDBUG_ON
-DSAFE_MUTEX
-DSAFEMALLOC
-DUNIV_DEBUG
$CXXFLAGS
"
CFLAGS="
$DEBUG_CFLAGS
-DDBUG_ON
-DSAFE_MUTEX
-DSAFEMALLOC
$CFLAGS
"
CXXFLAGS="
$DEBUG_CXXFLAGS
-DDBUG_ON
-DSAFE_MUTEX
-DSAFEMALLOC
$CXXFLAGS
"
else
# Optimized version. No debug
CFLAGS="
$OPTIMIZE_CFLAGS
-DDBUG_OFF
$CFLAGS
"
...
...
mysql-test/r/func_str.result
View file @
4ece8ae4
...
...
@@ -325,6 +325,19 @@ trim(trailing 'foo' from 'foo')
select trim(leading 'foo' from 'foo');
trim(leading 'foo' from 'foo')
select quote(ltrim(concat(' ', 'a')));
quote(ltrim(concat(' ', 'a')))
'a'
select quote(trim(concat(' ', 'a')));
quote(trim(concat(' ', 'a')))
'a'
CREATE TABLE t1 SELECT 1 UNION SELECT 2 UNION SELECT 3;
SELECT QUOTE('A') FROM t1;
QUOTE('A')
'A'
'A'
'A'
DROP TABLE t1;
select 1=_latin1'1';
1=_latin1'1'
1
...
...
@@ -691,12 +704,6 @@ select count(*) as total, left(c,10) as reg from t1 group by reg order by reg de
total reg
10 2004-12-10
drop table t1;
select quote(ltrim(concat(' ', 'a')));
quote(ltrim(concat(' ', 'a')))
'a'
select quote(trim(concat(' ', 'a')));
quote(trim(concat(' ', 'a')))
'a'
select trim(null from 'kate') as "must_be_null";
must_be_null
NULL
...
...
mysql-test/t/func_str.test
View file @
4ece8ae4
...
...
@@ -195,6 +195,18 @@ select trim(trailing 'foo' from 'foo');
select
trim
(
leading
'foo'
from
'foo'
);
#
# crashing bug with QUOTE() and LTRIM() or TRIM() fixed
# Bug #7495
#
select
quote
(
ltrim
(
concat
(
' '
,
'a'
)));
select
quote
(
trim
(
concat
(
' '
,
'a'
)));
# Bad results from QUOTE(). Bug #8248
CREATE
TABLE
t1
SELECT
1
UNION
SELECT
2
UNION
SELECT
3
;
SELECT
QUOTE
(
'A'
)
FROM
t1
;
DROP
TABLE
t1
;
# Test collation and coercibility
#
...
...
@@ -429,12 +441,6 @@ create table t1 (a int not null primary key, b varchar(40), c datetime);
insert
into
t1
(
a
,
b
,
c
)
values
(
1
,
'Tom'
,
'2004-12-10 12:13:14'
),(
2
,
'ball games'
,
'2004-12-10 12:13:14'
),
(
3
,
'Basil'
,
'2004-12-10 12:13:14'
),
(
4
,
'Dean'
,
'2004-12-10 12:13:14'
),(
5
,
'Ellis'
,
'2004-12-10 12:13:14'
),
(
6
,
'Serg'
,
'2004-12-10 12:13:14'
),
(
7
,
'Sergei'
,
'2004-12-10 12:13:14'
),(
8
,
'Georg'
,
'2004-12-10 12:13:14'
),(
9
,
'Salle'
,
'2004-12-10 12:13:14'
),(
10
,
'Sinisa'
,
'2004-12-10 12:13:14'
);
select
count
(
*
)
as
total
,
left
(
c
,
10
)
as
reg
from
t1
group
by
reg
order
by
reg
desc
limit
0
,
12
;
drop
table
t1
;
# crashing bug with QUOTE() and LTRIM() or TRIM() fixed
# Bug #7495
#
select
quote
(
ltrim
(
concat
(
' '
,
'a'
)));
select
quote
(
trim
(
concat
(
' '
,
'a'
)));
#
# Bug#7455 unexpected result: TRIM(<NULL> FROM <whatever>) gives NOT NULL
...
...
scripts/make_binary_distribution.sh
View file @
4ece8ae4
...
...
@@ -107,8 +107,11 @@ BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \
client/mysql
$BS
client/mysqlshow
$BS
client/mysqladmin
$BS
\
client/mysqldump
$BS
client/mysqlimport
$BS
\
client/mysqltest
$BS
client/mysqlcheck
$BS
\
client/mysqlbinlog
$BS
"
;
client/mysqlbinlog
$BS
\
tests/mysql_client_test
$BS
\
libmysqld/examples/mysql_client_test_embedded
$BS
\
libmysqld/examples/mysqltest_embedded
$BS
\
"
;
# Platform-specific bin dir files:
if
[
$BASE_SYSTEM
=
"netware"
]
;
then
...
...
@@ -127,8 +130,9 @@ else
client/.libs/mysqltest client/.libs/mysqlcheck
\
client/.libs/mysqlbinlog client/.libs/mysqlmanagerc
\
client/.libs/mysqlmanager-pwgen tools/.libs/mysqlmanager
\
tests/.libs/mysql_client_test libmysqld/examples/mysql_client_test_embedded
\
libmysqld/examples/mysqltest_embedded
\
tests/.libs/mysql_client_test
\
libmysqld/examples/.libs/mysql_client_test_embedded
\
libmysqld/examples/.libs/mysqltest_embedded
\
"
;
fi
...
...
sql/item_strfunc.cc
View file @
4ece8ae4
...
...
@@ -2614,18 +2614,13 @@ String *Item_func_quote::val_str(String *str)
for
(
from
=
(
char
*
)
arg
->
ptr
(),
end
=
from
+
arg_length
;
from
<
end
;
from
++
)
new_length
+=
get_esc_bit
(
escmask
,
(
uchar
)
*
from
);
/*
We have to use realloc() instead of alloc() as we want to keep the
old result in arg
*/
if
(
arg
->
realloc
(
new_length
))
if
(
tmp_value
.
alloc
(
new_length
))
goto
null
;
/*
As 'arg' and 'str' may be the same string, we must replace characters
from the end to the beginning
We replace characters from the end to the beginning
*/
to
=
(
char
*
)
arg
->
ptr
()
+
new_length
-
1
;
to
=
(
char
*
)
tmp_value
.
ptr
()
+
new_length
-
1
;
*
to
--=
'\''
;
for
(
start
=
(
char
*
)
arg
->
ptr
(),
end
=
start
+
arg_length
;
end
--
!=
start
;
to
--
)
{
...
...
@@ -2653,10 +2648,10 @@ String *Item_func_quote::val_str(String *str)
}
}
*
to
=
'\''
;
arg
->
length
(
new_length
);
str
->
set_charset
(
collation
.
collation
);
tmp_value
.
length
(
new_length
);
tmp_value
.
set_charset
(
collation
.
collation
);
null_value
=
0
;
return
arg
;
return
&
tmp_value
;
null:
null_value
=
1
;
...
...
sql/item_strfunc.h
View file @
4ece8ae4
...
...
@@ -588,6 +588,7 @@ public:
class
Item_func_quote
:
public
Item_str_func
{
String
tmp_value
;
public:
Item_func_quote
(
Item
*
a
)
:
Item_str_func
(
a
)
{}
const
char
*
func_name
()
const
{
return
"quote"
;
}
...
...
sql/mysqld.cc
View file @
4ece8ae4
...
...
@@ -5215,6 +5215,7 @@ The minimum value for this variable is 4096.",
(
gptr
*
)
&
sync_binlog_period
,
(
gptr
*
)
&
sync_binlog_period
,
0
,
GET_ULONG
,
REQUIRED_ARG
,
0
,
0
,
~
0L
,
0
,
1
,
0
},
#ifdef DOES_NOTHING_YET
{
"sync-replication"
,
OPT_SYNC_REPLICATION
,
"Enable synchronous replication"
,
(
gptr
*
)
&
global_system_variables
.
sync_replication
,
...
...
@@ -5230,6 +5231,7 @@ The minimum value for this variable is 4096.",
(
gptr
*
)
&
global_system_variables
.
sync_replication_timeout
,
(
gptr
*
)
&
global_system_variables
.
sync_replication_timeout
,
0
,
GET_ULONG
,
REQUIRED_ARG
,
10
,
0
,
~
0L
,
0
,
1
,
0
},
#endif
{
"sync-frm"
,
OPT_SYNC_FRM
,
"Sync .frm to disk on create. Enabled by default"
,
(
gptr
*
)
&
opt_sync_frm
,
(
gptr
*
)
&
opt_sync_frm
,
0
,
GET_BOOL
,
NO_ARG
,
1
,
0
,
0
,
0
,
0
,
0
},
...
...
sql/sql_parse.cc
View file @
4ece8ae4
...
...
@@ -660,6 +660,8 @@ static int check_connection(THD *thd)
DBUG_PRINT
(
"info"
,
(
"New connection received on %s"
,
vio_description
(
net
->
vio
)));
vio_in_addr
(
net
->
vio
,
&
thd
->
remote
.
sin_addr
);
if
(
!
thd
->
host
)
// If TCP/IP connection
{
char
ip
[
30
];
...
...
@@ -704,7 +706,6 @@ static int check_connection(THD *thd)
DBUG_PRINT
(
"info"
,(
"Host: %s"
,
thd
->
host
));
thd
->
host_or_ip
=
thd
->
host
;
thd
->
ip
=
0
;
bzero
((
char
*
)
&
thd
->
remote
,
sizeof
(
struct
sockaddr
));
}
vio_keepalive
(
net
->
vio
,
TRUE
);
ulong
pkt_len
=
0
;
...
...
sql/sql_update.cc
View file @
4ece8ae4
...
...
@@ -61,7 +61,7 @@ int mysql_update(THD *thd,
bool
safe_update
=
thd
->
options
&
OPTION_SAFE_UPDATES
;
bool
used_key_is_modified
,
transactional_table
,
log_delayed
;
int
error
=
0
;
uint
used_index
=
MAX_KEY
;
uint
used_index
;
#ifndef NO_EMBEDDED_ACCESS_CHECKS
uint
want_privilege
;
#endif
...
...
@@ -159,10 +159,11 @@ int mysql_update(THD *thd,
init_ftfuncs
(
thd
,
&
thd
->
lex
->
select_lex
,
1
);
/* Check if we are modifying a key that we are used to search with */
if
(
select
&&
select
->
quick
)
{
used_index
=
select
->
quick
->
index
;
used_key_is_modified
=
(
!
select
->
quick
->
unique_key_range
()
&&
check_if_key_used
(
table
,
(
used_index
=
select
->
quick
->
index
),
fields
));
check_if_key_used
(
table
,
used_index
,
fields
));
}
else
if
((
used_index
=
table
->
file
->
key_used_on_scan
)
<
MAX_KEY
)
used_key_is_modified
=
check_if_key_used
(
table
,
used_index
,
fields
);
else
...
...
vio/viosocket.c
View file @
4ece8ae4
...
...
@@ -276,7 +276,7 @@ void vio_in_addr(Vio *vio, struct in_addr *in)
{
DBUG_ENTER
(
"vio_in_addr"
);
if
(
vio
->
localhost
)
bzero
((
char
*
)
in
,
sizeof
(
*
in
));
/* This should never be executed */
bzero
((
char
*
)
in
,
sizeof
(
*
in
));
else
*
in
=
vio
->
remote
.
sin_addr
;
DBUG_VOID_RETURN
;
...
...
vio/viossl.c
View file @
4ece8ae4
...
...
@@ -259,7 +259,7 @@ void vio_ssl_in_addr(Vio *vio, struct in_addr *in)
{
DBUG_ENTER
(
"vio_ssl_in_addr"
);
if
(
vio
->
localhost
)
bzero
((
char
*
)
in
,
sizeof
(
*
in
));
/* This should never be executed */
bzero
((
char
*
)
in
,
sizeof
(
*
in
));
else
*
in
=
vio
->
remote
.
sin_addr
;
DBUG_VOID_RETURN
;
...
...
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