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
65034c9f
Commit
65034c9f
authored
Nov 02, 2005
by
monty@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/my/mysql-5.0
parents
efbdd24c
2018f26e
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
10 deletions
+13
-10
BUILD/SETUP.sh
BUILD/SETUP.sh
+7
-3
mysql-test/r/bdb.result
mysql-test/r/bdb.result
+1
-1
mysql-test/t/bdb.test
mysql-test/t/bdb.test
+1
-0
sql/item_func.cc
sql/item_func.cc
+0
-1
sql/sql_update.cc
sql/sql_update.cc
+3
-4
sql/table.cc
sql/table.cc
+1
-1
No files found.
BUILD/SETUP.sh
View file @
65034c9f
...
@@ -44,17 +44,21 @@ set -e
...
@@ -44,17 +44,21 @@ set -e
export
AM_MAKEFLAGS
export
AM_MAKEFLAGS
AM_MAKEFLAGS
=
"-j 4"
AM_MAKEFLAGS
=
"-j 4"
# SSL library to use. Should be changed to --with-yassl
SSL_LIBRARY
=
--with-openssl
# If you are not using codefusion add "-Wpointer-arith" to WARNINGS
# If you are not using codefusion add "-Wpointer-arith" to WARNINGS
# The following warning flag will give too many warnings:
# The following warning flag will give too many warnings:
# -Wshadow -Wunused -Winline (The later isn't usable in C++ as
# -Wshadow -Wunused -Winline (The later isn't usable in C++ as
# __attribute()__ doesn't work with gnu C++)
# __attribute()__ doesn't work with gnu C++)
global_warnings
=
"-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings"
global_warnings
=
"-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings"
#debug_extra_warnings="-Wuninitialized"
#debug_extra_warnings="-Wuninitialized"
c_warnings
=
"
$global_warnings
-Wunused"
c_warnings
=
"
$global_warnings
-Wunused"
cxx_warnings
=
"
$global_warnings
-Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
cxx_warnings
=
"
$global_warnings
-Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
base_max_configs
=
"--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-
openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine
"
base_max_configs
=
"--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-
big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine
$SSL_LIBRARY
"
base_max_no_ndb_configs
=
"--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-
openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine
"
base_max_no_ndb_configs
=
"--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-
big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine
$SSL_LIBRARY
"
max_leave_isam_configs
=
"--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine
--with-openssl
--with-embedded-server --with-big-tables"
max_leave_isam_configs
=
"--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine
$SSL_LIBRARY
--with-embedded-server --with-big-tables"
max_configs
=
"
$base_max_configs
--with-embedded-server"
max_configs
=
"
$base_max_configs
--with-embedded-server"
max_no_ndb_configs
=
"
$base_max_no_ndb_configs
--with-embedded-server"
max_no_ndb_configs
=
"
$base_max_no_ndb_configs
--with-embedded-server"
...
...
mysql-test/r/bdb.result
View file @
65034c9f
...
@@ -1870,7 +1870,7 @@ a b
...
@@ -1870,7 +1870,7 @@ a b
drop table t1;
drop table t1;
create table t1 (v varchar(65530), key(v));
create table t1 (v varchar(65530), key(v));
Warnings:
Warnings:
Warning 1071 Specified key was too long; max key length is
1024
bytes
Warning 1071 Specified key was too long; max key length is
MAX_KEY_LENGTH
bytes
drop table if exists t1;
drop table if exists t1;
create table t1 (v varchar(65536));
create table t1 (v varchar(65536));
Warnings:
Warnings:
...
...
mysql-test/t/bdb.test
View file @
65034c9f
...
@@ -962,6 +962,7 @@ source include/varchar.inc;
...
@@ -962,6 +962,7 @@ source include/varchar.inc;
# Some errors/warnings on create
# Some errors/warnings on create
#
#
--
replace_result
1024
MAX_KEY_LENGTH
3072
MAX_KEY_LENGTH
create
table
t1
(
v
varchar
(
65530
),
key
(
v
));
create
table
t1
(
v
varchar
(
65530
),
key
(
v
));
drop
table
if
exists
t1
;
drop
table
if
exists
t1
;
create
table
t1
(
v
varchar
(
65536
));
create
table
t1
(
v
varchar
(
65536
));
...
...
sql/item_func.cc
View file @
65034c9f
...
@@ -1378,7 +1378,6 @@ my_decimal *Item_func_abs::decimal_op(my_decimal *decimal_value)
...
@@ -1378,7 +1378,6 @@ my_decimal *Item_func_abs::decimal_op(my_decimal *decimal_value)
void
Item_func_abs
::
fix_length_and_dec
()
void
Item_func_abs
::
fix_length_and_dec
()
{
{
Item_func_num1
::
fix_length_and_dec
();
Item_func_num1
::
fix_length_and_dec
();
maybe_null
=
1
;
}
}
...
...
sql/sql_update.cc
View file @
65034c9f
...
@@ -121,7 +121,7 @@ int mysql_update(THD *thd,
...
@@ -121,7 +121,7 @@ int mysql_update(THD *thd,
bool
safe_update
=
thd
->
options
&
OPTION_SAFE_UPDATES
;
bool
safe_update
=
thd
->
options
&
OPTION_SAFE_UPDATES
;
bool
used_key_is_modified
,
transactional_table
;
bool
used_key_is_modified
,
transactional_table
;
int
res
;
int
res
;
int
error
=
0
;
int
error
;
uint
used_index
=
MAX_KEY
;
uint
used_index
=
MAX_KEY
;
bool
need_sort
=
TRUE
;
bool
need_sort
=
TRUE
;
#ifndef NO_EMBEDDED_ACCESS_CHECKS
#ifndef NO_EMBEDDED_ACCESS_CHECKS
...
@@ -132,7 +132,7 @@ int mysql_update(THD *thd,
...
@@ -132,7 +132,7 @@ int mysql_update(THD *thd,
ha_rows
updated
,
found
;
ha_rows
updated
,
found
;
key_map
old_used_keys
;
key_map
old_used_keys
;
TABLE
*
table
;
TABLE
*
table
;
SQL_SELECT
*
select
=
0
;
SQL_SELECT
*
select
;
READ_RECORD
info
;
READ_RECORD
info
;
SELECT_LEX
*
select_lex
=
&
thd
->
lex
->
select_lex
;
SELECT_LEX
*
select_lex
=
&
thd
->
lex
->
select_lex
;
bool
need_reopen
;
bool
need_reopen
;
...
@@ -237,7 +237,6 @@ int mysql_update(THD *thd,
...
@@ -237,7 +237,6 @@ int mysql_update(THD *thd,
}
}
// Don't count on usage of 'only index' when calculating which key to use
// Don't count on usage of 'only index' when calculating which key to use
table
->
used_keys
.
clear_all
();
table
->
used_keys
.
clear_all
();
if
(
limit
)
select
=
make_select
(
table
,
0
,
0
,
conds
,
0
,
&
error
);
select
=
make_select
(
table
,
0
,
0
,
conds
,
0
,
&
error
);
if
(
error
||
!
limit
||
if
(
error
||
!
limit
||
(
select
&&
select
->
check_quick
(
thd
,
safe_update
,
limit
)))
(
select
&&
select
->
check_quick
(
thd
,
safe_update
,
limit
)))
...
...
sql/table.cc
View file @
65034c9f
...
@@ -2511,9 +2511,9 @@ bool st_table_list::prepare_security(THD *thd)
...
@@ -2511,9 +2511,9 @@ bool st_table_list::prepare_security(THD *thd)
{
{
List_iterator_fast
<
TABLE_LIST
>
tb
(
*
view_tables
);
List_iterator_fast
<
TABLE_LIST
>
tb
(
*
view_tables
);
TABLE_LIST
*
tbl
;
TABLE_LIST
*
tbl
;
DBUG_ENTER
(
"st_table_list::prepare_security"
);
#ifndef NO_EMBEDDED_ACCESS_CHECKS
#ifndef NO_EMBEDDED_ACCESS_CHECKS
Security_context
*
save_security_ctx
=
thd
->
security_ctx
;
Security_context
*
save_security_ctx
=
thd
->
security_ctx
;
DBUG_ENTER
(
"st_table_list::prepare_security"
);
DBUG_ASSERT
(
!
prelocking_placeholder
);
DBUG_ASSERT
(
!
prelocking_placeholder
);
if
(
prepare_view_securety_context
(
thd
))
if
(
prepare_view_securety_context
(
thd
))
...
...
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