database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41

Browse Source 
into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/50


BUILD/SETUP.sh:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
BUILD/check-cpu:
  Manual merge.
This commit is contained in:
unknown
2006-08-30 23:14:29 +02:00
parent a10a5cb663 077b649aef
commit 4e16868d88
4 changed files with 200 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
BUILD/SETUP.sh
View File

@@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
if ! test -f sql/mysqld.cc if test ! -f sql/mysqld.cc
then then
echo "You must run this script from the MySQL top-level directory" echo "You must run this script from the MySQL top-level directory"
exit 1 exit 1
@@ -122,12 +122,6 @@ fi
# (returns 0 if finds lines) # (returns 0 if finds lines)
if ccache -V > /dev/null 2>&1 if ccache -V > /dev/null 2>&1
then then
if ! (echo "$CC" | grep "ccache" > /dev/null) echo "$CC" | grep "ccache" > /dev/null || CC="ccache $CC"
then echo "$CXX" | grep "ccache" > /dev/null || CXX="ccache $CXX"
CC="ccache $CC"
fi
if ! (echo "$CXX" | grep "ccache" > /dev/null)
then
CXX="ccache $CXX"
fi
fi fi

13
BUILD/check-cpu
View File

@@ -3,8 +3,8 @@
# Check cpu of current machine and find the # Check cpu of current machine and find the
# best compiler optimization flags for gcc # best compiler optimization flags for gcc
# #
#
check_cpu () {
if test -r /proc/cpuinfo ; then if test -r /proc/cpuinfo ; then
# on Linux (and others?) we can get detailed CPU information out of /proc # on Linux (and others?) we can get detailed CPU information out of /proc
cpuinfo="cat /proc/cpuinfo" cpuinfo="cat /proc/cpuinfo"
@@ -117,7 +117,7 @@ esac
if test -z "$cpu_arg"; then if test -z "$cpu_arg"; then
echo "BUILD/check-cpu: Oops, could not find out what kind of cpu this machine is using." echo "BUILD/check-cpu: Oops, could not find out what kind of cpu this machine is using." >&2
check_cpu_cflags="" check_cpu_cflags=""
return return
fi fi
@@ -173,16 +173,17 @@ esac
touch __test.c touch __test.c
while [ "$cpu_arg" ] ; do while [ "$cpu_arg" ] ; do
echo -n testing $cpu_arg "... " # FIXME: echo -n isn't portable - see contortions autoconf goes through
echo -n testing $cpu_arg "... " >&2
# compile check # compile check
check_cpu_cflags=`eval echo $check_cpu_args` check_cpu_cflags=`eval echo $check_cpu_args`
if $cc -c $check_cpu_cflags __test.c 2>/dev/null; then if $cc -c $check_cpu_cflags __test.c 2>/dev/null; then
echo ok echo ok >&2
break; break;
fi fi
echo failed echo failed >&2
check_cpu_cflags="" check_cpu_cflags=""
# if compile failed: check whether it supports a predecessor of this CPU # if compile failed: check whether it supports a predecessor of this CPU
@@ -208,4 +209,6 @@ while [ "$cpu_arg" ] ; do
done done
rm __test.* rm __test.*
}
check_cpu

14
mysql-test/r/ctype_ucs.result
View File

@@ -734,26 +734,26 @@ drop table if exists bug20536;
set names latin1; set names latin1;
create table bug20536 (id bigint not null auto_increment primary key, name create table bug20536 (id bigint not null auto_increment primary key, name
varchar(255) character set ucs2 not null); varchar(255) character set ucs2 not null);
insert into `bug20536` (`id`,`name`) values (1, _latin1 x'74657374311a'), (2, "'test\\_2'"); insert into `bug20536` (`id`,`name`) values (1, _latin1 x'7465737431'), (2, "'test\\_2'");
select md5(name) from bug20536; select md5(name) from bug20536;
md5(name) md5(name)
3417d830fe24ffb2f81a28e54df2d1b3 f4b7ce8b45a20e3c4e84bef515d1525c
48d95db0d8305c2fe11548a3635c9385 48d95db0d8305c2fe11548a3635c9385
select sha1(name) from bug20536; select sha1(name) from bug20536;
sha1(name) sha1(name)
72228a6d56efb7a89a09543068d5d8fa4c330881 e0b52f38deddb9f9e8d5336b153592794cb49baf
677d4d505355eb5b0549b865fcae4b7f0c28aef5 677d4d505355eb5b0549b865fcae4b7f0c28aef5
select make_set(3, name, upper(name)) from bug20536; select make_set(3, name, upper(name)) from bug20536;
make_set(3, name, upper(name)) make_set(3, name, upper(name))
test1,TEST1 test1,TEST1
'test\_2','TEST\_2' 'test\_2','TEST\_2'
select export_set(5, name, upper(name)) from bug20536; select export_set(5, name, upper(name)) from bug20536;
export_set(5, name, upper(name)) export_set(5, name, upper(name))
test1,TEST1,test1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1 test1,TEST1,test1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1
'test\_2','TEST\_2','test\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2' 'test\_2','TEST\_2','test\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2'
select export_set(5, name, upper(name), ",", 5) from bug20536; select export_set(5, name, upper(name), ",", 5) from bug20536;
export_set(5, name, upper(name), ",", 5) export_set(5, name, upper(name), ",", 5)
test1,TEST1,test1,TEST1,TEST1 test1,TEST1,test1,TEST1,TEST1
'test\_2','TEST\_2','test\_2','TEST\_2','TEST\_2' 'test\_2','TEST\_2','test\_2','TEST\_2','TEST\_2'
select password(name) from bug20536; select password(name) from bug20536;
password(name) password(name)
@@ -769,7 +769,7 @@ SA5pDi1UPZdys
SA5pDi1UPZdys SA5pDi1UPZdys
select quote(name) from bug20536; select quote(name) from bug20536;
quote(name) quote(name)
?????????? ????????
???????????????? ????????????????
drop table bug20536; drop table bug20536;
End of 4.1 tests End of 4.1 tests

2
mysql-test/t/ctype_ucs.test
View File

@@ -477,7 +477,7 @@ drop table if exists bug20536;
set names latin1; set names latin1;
create table bug20536 (id bigint not null auto_increment primary key, name create table bug20536 (id bigint not null auto_increment primary key, name
varchar(255) character set ucs2 not null); varchar(255) character set ucs2 not null);
insert into `bug20536` (`id`,`name`) values (1, _latin1 x'74657374311a'), (2, "'test\\_2'"); insert into `bug20536` (`id`,`name`) values (1, _latin1 x'7465737431'), (2, "'test\\_2'");
select md5(name) from bug20536; select md5(name) from bug20536;
select sha1(name) from bug20536; select sha1(name) from bug20536;
select make_set(3, name, upper(name)) from bug20536; select make_set(3, name, upper(name)) from bug20536;