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
dbcf3b3a
Commit
dbcf3b3a
authored
May 26, 2005
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
parents
6c00006d
68899dec
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
53 additions
and
17 deletions
+53
-17
innobase/row/row0mysql.c
innobase/row/row0mysql.c
+5
-0
mysql-test/r/union.result
mysql-test/r/union.result
+14
-0
mysql-test/t/union.test
mysql-test/t/union.test
+10
-0
sql/item.cc
sql/item.cc
+2
-2
support-files/mysql.spec.sh
support-files/mysql.spec.sh
+22
-15
No files found.
innobase/row/row0mysql.c
View file @
dbcf3b3a
...
...
@@ -2575,6 +2575,7 @@ row_drop_table_for_mysql(
foreign
=
UT_LIST_GET_FIRST
(
table
->
referenced_list
);
while
(
foreign
&&
foreign
->
foreign_table
==
table
)
{
check_next_foreign:
foreign
=
UT_LIST_GET_NEXT
(
referenced_list
,
foreign
);
}
...
...
@@ -2603,6 +2604,10 @@ row_drop_table_for_mysql(
goto
funct_exit
;
}
if
(
foreign
&&
trx
->
check_foreigns
)
{
goto
check_next_foreign
;
}
if
(
table
->
n_mysql_handles_opened
>
0
)
{
ibool
added
;
...
...
mysql-test/r/union.result
View file @
dbcf3b3a
...
...
@@ -1235,6 +1235,20 @@ show columns from t2;
Field Type Null Key Default Extra
a varchar(3) YES NULL
drop table t2, t1;
CREATE TABLE t1 (a mediumtext);
CREATE TABLE t2 (b varchar(20));
INSERT INTO t1 VALUES ('a'),('b');
SELECT left(a,100000000) FROM t1 UNION SELECT b FROM t2;
left(a,100000000)
a
b
create table t3 SELECT left(a,100000000) FROM t1 UNION SELECT b FROM t2;
show create table t3;
Table Create Table
t3 CREATE TABLE `t3` (
`left(a,100000000)` longtext
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop tables t1,t2,t3;
create table t1 ( id int not null auto_increment, primary key (id), col1 int);
insert into t1 (col1) values (2),(3),(4),(5),(6);
select 99 union all select id from t1 order by 1;
...
...
mysql-test/t/union.test
View file @
dbcf3b3a
...
...
@@ -743,6 +743,16 @@ create table t2 select a from t1 union select b from t1;
show
columns
from
t2
;
drop
table
t2
,
t1
;
#
# correct conversion long string to TEXT (BUG#10025)
#
CREATE
TABLE
t1
(
a
mediumtext
);
CREATE
TABLE
t2
(
b
varchar
(
20
));
INSERT
INTO
t1
VALUES
(
'a'
),(
'b'
);
SELECT
left
(
a
,
100000000
)
FROM
t1
UNION
SELECT
b
FROM
t2
;
create
table
t3
SELECT
left
(
a
,
100000000
)
FROM
t1
UNION
SELECT
b
FROM
t2
;
show
create
table
t3
;
drop
tables
t1
,
t2
,
t3
;
#
# Bug #10032 Bug in parsing UNION with ORDER BY when one node does not use FROM
...
...
sql/item.cc
View file @
dbcf3b3a
...
...
@@ -3100,8 +3100,8 @@ Field *Item_type_holder::make_field_by_type(TABLE *table)
enum_set_typelib
,
collation
.
collation
);
case
MYSQL_TYPE_VAR_STRING
:
table
->
db_create_options
|=
HA_OPTION_PACK_RECORD
;
return
new
Field_string
(
max_length
,
maybe_null
,
name
,
table
,
collation
.
collation
)
;
fld_type
=
MYSQL_TYPE_STRING
;
break
;
default:
break
;
}
...
...
support-files/mysql.spec.sh
View file @
dbcf3b3a
...
...
@@ -16,8 +16,8 @@
Name: MySQL
Summary: MySQL: a very fast and reliable SQL database server
Group: Applications/Databases
Summary
(
pt_BR
)
: MySQL: Um servidor SQL r
pido e confi
vel.
Group
(
pt_BR
)
: Aplicaes/Banco_de_Dados
Summary
(
pt_BR
)
: MySQL: Um servidor SQL r
ápido e confiá
vel.
Group
(
pt_BR
)
: Aplica
çõ
es/Banco_de_Dados
Version: @MYSQL_NO_DASH_VERSION@
Release: %
{
release
}
License: GPL
...
...
@@ -57,8 +57,8 @@ documentation and the manual for more information.
Release: %
{
release
}
Summary: MySQL: a very fast and reliable SQL database server
Group: Applications/Databases
Summary
(
pt_BR
)
: MySQL: Um servidor SQL r
pido e confi
vel.
Group
(
pt_BR
)
: Aplicaes/Banco_de_Dados
Summary
(
pt_BR
)
: MySQL: Um servidor SQL r
ápido e confiá
vel.
Group
(
pt_BR
)
: Aplica
çõ
es/Banco_de_Dados
Requires: fileutils sh-utils
Provides: msqlormysql mysql-server mysql MySQL
Obsoletes: MySQL mysql mysql-server
...
...
@@ -92,7 +92,7 @@ Release: %{release}
Summary: MySQL - Client
Group: Applications/Databases
Summary
(
pt_BR
)
: MySQL - Cliente
Group
(
pt_BR
)
: Aplicaes/Banco_de_Dados
Group
(
pt_BR
)
: Aplica
çõ
es/Banco_de_Dados
Obsoletes: mysql-client
Provides: mysql-client
...
...
@@ -102,7 +102,7 @@ This package contains the standard MySQL clients and administration tools.
%
{
see_base
}
%description client
-l
pt_BR
Este pacote cont
m os clientes padr
o para o MySQL.
Este pacote cont
ém os clientes padrã
o para o MySQL.
%package ndb-storage
Release: %
{
release
}
...
...
@@ -156,8 +156,8 @@ Release: %{release}
Requires: %
{
name
}
-client
perl-DBI perl
Summary: MySQL - Benchmarks and
test
system
Group: Applications/Databases
Summary
(
pt_BR
)
: MySQL - Medies de desempenho
Group
(
pt_BR
)
: Aplicaes/Banco_de_Dados
Summary
(
pt_BR
)
: MySQL - Medi
çõ
es de desempenho
Group
(
pt_BR
)
: Aplica
çõ
es/Banco_de_Dados
Provides: mysql-bench
Obsoletes: mysql-bench
...
...
@@ -167,14 +167,14 @@ This package contains MySQL benchmark scripts and data.
%
{
see_base
}
%description bench
-l
pt_BR
Este pacote cont
m medi
es de desempenho de scripts e dados
do
MySQL.
Este pacote cont
ém mediçõ
es de desempenho de scripts e dados
do
MySQL.
%package devel
Release: %
{
release
}
Summary: MySQL - Development header files and libraries
Group: Applications/Databases
Summary
(
pt_BR
)
: MySQL - Medies de desempenho
Group
(
pt_BR
)
: Aplicaes/Banco_de_Dados
Summary
(
pt_BR
)
: MySQL - Medi
çõ
es de desempenho
Group
(
pt_BR
)
: Aplica
çõ
es/Banco_de_Dados
Provides: mysql-devel
Obsoletes: mysql-devel
...
...
@@ -185,8 +185,8 @@ necessary to develop MySQL client applications.
%
{
see_base
}
%description devel
-l
pt_BR
Este pacote cont
m os arquivos de cabe
alho
(
header files
)
e bibliotecas
necess
rias para desenvolver aplica
es clientes
do
MySQL.
Este pacote cont
ém os arquivos de cabeç
alho
(
header files
)
e bibliotecas
necess
árias para desenvolver aplicaçõ
es clientes
do
MySQL.
%package shared
Release: %
{
release
}
...
...
@@ -226,8 +226,8 @@ Release: %{release}
Requires: %
{
name
}
-devel
Summary: MySQL - embedded library
Group: Applications/Databases
Summary
(
pt_BR
)
: MySQL - Medies de desempenho
Group
(
pt_BR
)
: Aplicaes/Banco_de_Dados
Summary
(
pt_BR
)
: MySQL - Medi
çõ
es de desempenho
Group
(
pt_BR
)
: Aplica
çõ
es/Banco_de_Dados
Obsoletes: mysql-embedded
%description embedded
...
...
@@ -364,6 +364,9 @@ fi
(
cd
libmysql/.libs
;
tar
cf
$RBR
/shared-libs.tar
*
.so
*
)
(
cd
libmysql_r/.libs
;
tar
rf
$RBR
/shared-libs.tar
*
.so
*
)
# Now clean up
make clean
#
# Only link statically on our i386 build host (which has a specially
# patched static glibc installed) - ia64 and x86_64 run glibc-2.3 (unpatched)
...
...
@@ -689,6 +692,10 @@ fi
# itself - note that they must be ordered by date (important when
# merging BK trees)
%changelog
*
Wed May 25 2005 Joerg Bruehe <joerg@mysql.com>
- Added a
"make clean"
between separate calls to
"BuildMySQL"
.
*
Wed Apr 20 2005 Lenz Grimmer <lenz@mysql.com>
- Enabled the
"blackhole"
storage engine
for
the Max RPM
...
...
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