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
da7108d4
Commit
da7108d4
authored
May 04, 2006
by
igor@rurik.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
parents
dd839667
dee1baae
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
96 additions
and
6 deletions
+96
-6
VC++Files/libmysqld/libmysqld.dsp
VC++Files/libmysqld/libmysqld.dsp
+4
-0
VC++Files/libmysqld/libmysqld.vcproj
VC++Files/libmysqld/libmysqld.vcproj
+36
-0
VC++Files/libmysqld/libmysqld_ia64.dsp
VC++Files/libmysqld/libmysqld_ia64.dsp
+4
-0
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+1
-0
mysql-test/r/analyze.result
mysql-test/r/analyze.result
+8
-0
mysql-test/r/innodb.result
mysql-test/r/innodb.result
+2
-0
mysql-test/r/sp_notembedded.result
mysql-test/r/sp_notembedded.result
+1
-0
mysql-test/t/analyze.test
mysql-test/t/analyze.test
+8
-0
mysql-test/t/heap_btree.test
mysql-test/t/heap_btree.test
+2
-0
mysql-test/t/innodb.test
mysql-test/t/innodb.test
+6
-0
mysql-test/t/sp_notembedded.test
mysql-test/t/sp_notembedded.test
+4
-0
sql/ha_myisam.cc
sql/ha_myisam.cc
+1
-1
sql/handler.h
sql/handler.h
+1
-0
sql/share/errmsg.txt
sql/share/errmsg.txt
+2
-0
sql/sql_table.cc
sql/sql_table.cc
+16
-5
No files found.
VC++Files/libmysqld/libmysqld.dsp
View file @
da7108d4
...
...
@@ -363,6 +363,10 @@ SOURCE=..\mysys\my_getopt.c
SOURCE=..\sql-common\my_time.c
# End Source File
# Begin Source File
SOURCE=..\sql-common\my_user.c
# End Source File
# Begin Source File
SOURCE=..\sql\net_serv.cpp
# End Source File
...
...
VC++Files/libmysqld/libmysqld.vcproj
View file @
da7108d4
...
...
@@ -2009,6 +2009,42 @@
PreprocessorDefinitions=
"WIN32;_WINDOWS;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;USE_TLS;__WIN__;LICENSE=Commercial;DBUG_OFF;_MBCS;NDEBUG;$(NoInherit)"
/>
</FileConfiguration>
</File>
<File
RelativePath=
"..\sql-common\my_user.c"
>
<FileConfiguration
Name=
"Debug|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"0"
AdditionalIncludeDirectories=
""
PreprocessorDefinitions=
"WIN32;_DEBUG;_WINDOWS;_MBCS;SAFEMALLOC;HAVE_BERKELEY_DB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;USE_TLS;__WIN__;$(NoInherit)"
BasicRuntimeChecks=
"3"
/>
</FileConfiguration>
<FileConfiguration
Name=
"pro|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"2"
AdditionalIncludeDirectories=
""
PreprocessorDefinitions=
"WIN32;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;EMBEDDED_LIBRARY;USE_TLS;__WIN__;MYSQL_SERVER;LICENSE=Commercial;_MBCS;HAVE_DLOPEN;HAVE_INNOBASE_DB;DBUG_OFF;NDEBUG;_WINDOWS;_CONSOLE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
Name=
"Release|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"2"
AdditionalIncludeDirectories=
""
PreprocessorDefinitions=
"WIN32;NDEBUG;_WINDOWS;_MBCS;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;DBUG_OFF;USE_TLS;__WIN__;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
Name=
"classic|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"2"
AdditionalIncludeDirectories=
""
PreprocessorDefinitions=
"WIN32;_WINDOWS;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;USE_TLS;__WIN__;LICENSE=Commercial;DBUG_OFF;_MBCS;NDEBUG;$(NoInherit)"
/>
</FileConfiguration>
</File>
<File
RelativePath=
"..\sql\net_serv.cpp"
>
<FileConfiguration
...
...
VC++Files/libmysqld/libmysqld_ia64.dsp
View file @
da7108d4
...
...
@@ -338,6 +338,10 @@ SOURCE="..\sql-common\my_time.c"
# End Source File
# Begin Source File
SOURCE="..\sql-common\my_user.c"
# End Source File
# Begin Source File
SOURCE=..\sql\net_serv.cpp
# End Source File
# Begin Source File
...
...
mysql-test/mysql-test-run.pl
View file @
da7108d4
...
...
@@ -744,6 +744,7 @@ sub command_line_setup () {
$glob_use_embedded_server
=
1
;
push
(
@glob_test_mode
,
"
embedded
");
$opt_skip_rpl
=
1
;
# We never run replication with embedded
$opt_skip_ndbcluster
=
1
;
if
(
$opt_extern
)
{
...
...
mysql-test/r/analyze.result
View file @
da7108d4
...
...
@@ -46,4 +46,12 @@ Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_
execute stmt1;
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
deallocate prepare stmt1;
create temporary table t1(a int, index(a));
insert into t1 values('1'),('2'),('3'),('4'),('5');
analyze table t1;
Table Op Msg_type Msg_text
test.t1 analyze status OK
show index from t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t1 1 a 1 a A 5 NULL NULL YES BTREE
drop table t1;
mysql-test/r/innodb.result
View file @
da7108d4
...
...
@@ -3278,3 +3278,5 @@ SELECT p0.a FROM t2 p0 WHERE BINARY p0.b = 'customer_over';
a
1
drop table t2, t1;
create table t1 (g geometry not null, spatial gk(g)) engine=innodb;
ERROR HY000: The used table type doesn't support SPATIAL indexes
mysql-test/r/sp_notembedded.result
View file @
da7108d4
drop table if exists t1,t3;
drop procedure if exists bug4902|
create procedure bug4902()
begin
...
...
mysql-test/t/analyze.test
View file @
da7108d4
...
...
@@ -61,6 +61,14 @@ prepare stmt1 from "SELECT * FROM t1 PROCEDURE ANALYSE()";
execute
stmt1
;
execute
stmt1
;
deallocate
prepare
stmt1
;
#
# bug#15225 (ANALYZE temporary has no effect)
#
create
temporary
table
t1
(
a
int
,
index
(
a
));
insert
into
t1
values
(
'1'
),(
'2'
),(
'3'
),(
'4'
),(
'5'
);
analyze
table
t1
;
show
index
from
t1
;
drop
table
t1
;
# End of 4.1 tests
mysql-test/t/heap_btree.test
View file @
da7108d4
...
...
@@ -169,8 +169,10 @@ DROP TABLE t1;
#
CREATE
TABLE
t1
(
val
INT
,
KEY
USING
BTREE
(
val
))
ENGINE
=
memory
;
INSERT
INTO
t1
VALUES
(
0
);
--
replace_result
37
21
SELECT
INDEX_LENGTH
FROM
INFORMATION_SCHEMA
.
TABLES
WHERE
TABLE_SCHEMA
=
DATABASE
()
AND
TABLE_NAME
=
't1'
;
UPDATE
t1
SET
val
=
1
;
--
replace_result
37
21
SELECT
INDEX_LENGTH
FROM
INFORMATION_SCHEMA
.
TABLES
WHERE
TABLE_SCHEMA
=
DATABASE
()
AND
TABLE_NAME
=
't1'
;
DROP
TABLE
t1
;
...
...
mysql-test/t/innodb.test
View file @
da7108d4
...
...
@@ -2190,3 +2190,9 @@ SELECT DISTINCT p0.a FROM t2 p0 WHERE BINARY p0.b = 'customer_over';
SELECT
p0
.
a
FROM
t2
p0
WHERE
BINARY
p0
.
b
=
'customer_over'
;
drop
table
t2
,
t1
;
#
# Bug #15680 (SPATIAL key in innodb)
#
--
error
ER_TABLE_CANT_HANDLE_SPKEYS
create
table
t1
(
g
geometry
not
null
,
spatial
gk
(
g
))
engine
=
innodb
;
mysql-test/t/sp_notembedded.test
View file @
da7108d4
# Can't test with embedded server
--
source
include
/
not_embedded
.
inc
--
sleep
2
--
disable_warnings
drop
table
if
exists
t1
,
t3
;
--
enable_warnings
delimiter
|
;
#
...
...
sql/ha_myisam.cc
View file @
da7108d4
...
...
@@ -165,7 +165,7 @@ ha_myisam::ha_myisam(TABLE *table_arg)
int_table_flags
(
HA_NULL_IN_KEY
|
HA_CAN_FULLTEXT
|
HA_CAN_SQL_HANDLER
|
HA_DUPP_POS
|
HA_CAN_INDEX_BLOBS
|
HA_AUTO_PART_KEY
|
HA_FILE_BASED
|
HA_CAN_GEOMETRY
|
HA_READ_RND_SAME
|
HA_CAN_INSERT_DELAYED
|
HA_CAN_BIT_FIELD
),
HA_CAN_INSERT_DELAYED
|
HA_CAN_BIT_FIELD
|
HA_CAN_RTREEKEYS
),
can_enable_indexes
(
1
)
{}
...
...
sql/handler.h
View file @
da7108d4
...
...
@@ -80,6 +80,7 @@
*/
#define HA_CAN_INSERT_DELAYED (1 << 14)
#define HA_PRIMARY_KEY_IN_READ_INDEX (1 << 15)
#define HA_CAN_RTREEKEYS (1 << 17)
#define HA_NOT_DELETE_WITH_CACHE (1 << 18)
#define HA_NO_PREFIX_CHAR_KEYS (1 << 20)
#define HA_CAN_FULLTEXT (1 << 21)
...
...
sql/share/errmsg.txt
View file @
da7108d4
...
...
@@ -5617,3 +5617,5 @@ ER_VIEW_RECURSIVE
eng "`%-.64s`.`%-.64s` contains view recursion"
ER_NON_GROUPING_FIELD_USED 42000
eng "non-grouping field '%-.64s' is used in %-.64s clause"
ER_TABLE_CANT_HANDLE_SPKEYS
eng "The used table type doesn't support SPATIAL indexes"
sql/sql_table.cc
View file @
da7108d4
...
...
@@ -1159,6 +1159,12 @@ static int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info,
/* TODO: Add proper checks if handler supports key_type and algorithm */
if
(
key_info
->
flags
&
HA_SPATIAL
)
{
if
(
!
(
file
->
table_flags
()
&
HA_CAN_RTREEKEYS
))
{
my_message
(
ER_TABLE_CANT_HANDLE_SPKEYS
,
ER
(
ER_TABLE_CANT_HANDLE_SPKEYS
),
MYF
(
0
));
DBUG_RETURN
(
-
1
);
}
if
(
key_info
->
key_parts
!=
1
)
{
my_error
(
ER_WRONG_ARGUMENTS
,
MYF
(
0
),
"SPATIAL INDEX"
);
...
...
@@ -2566,11 +2572,16 @@ send_result_message:
table
->
table
->
s
->
version
=
0
;
// Force close of table
else
if
(
open_for_modify
)
{
pthread_mutex_lock
(
&
LOCK_open
);
remove_table_from_cache
(
thd
,
table
->
table
->
s
->
db
,
table
->
table
->
s
->
table_name
,
RTFC_NO_FLAG
);
pthread_mutex_unlock
(
&
LOCK_open
);
/* Something may be modified, that's why we have to invalidate cache */
if
(
table
->
table
->
s
->
tmp_table
)
table
->
table
->
file
->
info
(
HA_STATUS_CONST
);
else
{
pthread_mutex_lock
(
&
LOCK_open
);
remove_table_from_cache
(
thd
,
table
->
table
->
s
->
db
,
table
->
table
->
s
->
table_name
,
RTFC_NO_FLAG
);
pthread_mutex_unlock
(
&
LOCK_open
);
}
/* May be something modified consequently we have to invalidate cache */
query_cache_invalidate3
(
thd
,
table
->
table
,
0
);
}
}
...
...
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