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
7c5609fb
Commit
7c5609fb
authored
Dec 20, 2022
by
musvaage
Committed by
Daniel Black
Dec 21, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
typos
parent
3ddc00dc
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
27 additions
and
27 deletions
+27
-27
mysql-test/suite/innodb_fts/t/innodb-fts-stopword.test
mysql-test/suite/innodb_fts/t/innodb-fts-stopword.test
+8
-8
mysql-test/suite/innodb_fts/t/stopword.test
mysql-test/suite/innodb_fts/t/stopword.test
+8
-8
mysql-test/suite/parts/t/partition_repair_myisam.test
mysql-test/suite/parts/t/partition_repair_myisam.test
+1
-1
storage/connect/value.cpp
storage/connect/value.cpp
+4
-4
storage/innobase/row/row0row.cc
storage/innobase/row/row0row.cc
+2
-2
storage/maria/ma_locking.c
storage/maria/ma_locking.c
+1
-1
storage/maria/ma_loghandler.c
storage/maria/ma_loghandler.c
+1
-1
storage/myisam/mi_locking.c
storage/myisam/mi_locking.c
+1
-1
storage/rocksdb/ha_rocksdb.cc
storage/rocksdb/ha_rocksdb.cc
+1
-1
No files found.
mysql-test/suite/innodb_fts/t/innodb-fts-stopword.test
View file @
7c5609fb
...
...
@@ -39,7 +39,7 @@ select @@innodb_ft_user_stopword_table;
--
error
1231
set
global
innodb_ft_server_stopword_table
=
"not_defined"
;
# Define a correct formated user stopword table
# Define a correct format
t
ed user stopword table
create
table
user_stopword
(
value
varchar
(
30
))
engine
=
innodb
;
# The set operation should be successful
...
...
@@ -319,11 +319,11 @@ INSERT INTO articles (title,body) VALUES
# No records expeced for select
SELECT
*
FROM
articles
WHERE
MATCH
(
title
,
body
)
AGAINST
(
"+show +will"
IN
BOOLEAN
MODE
);
SELECT
*
FROM
articles
WHERE
MATCH
(
title
,
body
)
AGAINST
(
'will'
);
# Define a correct formated user stopword table
# Define a correct format
t
ed user stopword table
create
table
user_stopword
(
value
varchar
(
30
))
engine
=
innodb
;
# The set operation should be successful
set
session
innodb_ft_user_stopword_table
=
"test/user_stopword"
;
# Define a correct formated server stopword table
# Define a correct format
t
ed server stopword table
create
table
server_stopword
(
value
varchar
(
30
))
engine
=
innodb
;
# The set operation should be successful
set
global
innodb_ft_server_stopword_table
=
"test/server_stopword"
;
...
...
@@ -422,7 +422,7 @@ INSERT INTO articles (title,body) VALUES
# No records expeced for select
SELECT
*
FROM
articles
WHERE
MATCH
(
title
,
body
)
AGAINST
(
"+show +will"
IN
BOOLEAN
MODE
);
SELECT
*
FROM
articles
WHERE
MATCH
(
title
,
body
)
AGAINST
(
'will'
);
# Define a correct formated user stopword table
# Define a correct format
t
ed user stopword table
create
table
user_stopword
(
value
varchar
(
30
))
engine
=
innodb
;
# The set operation should be successful
set
session
innodb_ft_user_stopword_table
=
"test/user_stopword"
;
...
...
@@ -444,7 +444,7 @@ SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('mysqld');
# set user stopword list empty
set
session
innodb_ft_user_stopword_table
=
default
;
# Define a correct formated user stopword table
# Define a correct format
t
ed user stopword table
create
table
server_stopword
(
value
varchar
(
30
))
engine
=
innodb
;
# The set operation should be successful
set
global
innodb_ft_server_stopword_table
=
"test/server_stopword"
;
...
...
@@ -580,7 +580,7 @@ SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('"the will"@11' IN BOOL
--
connection
con1
SET
SESSION
innodb_ft_enable_stopword
=
1
;
# Define a correct formated user stopword table
# Define a correct format
t
ed user stopword table
create
table
user_stopword
(
value
varchar
(
30
))
engine
=
innodb
;
# The set operation should be successful
set
session
innodb_ft_user_stopword_table
=
"test/user_stopword"
;
...
...
@@ -599,7 +599,7 @@ SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('will');
SELECT
*
FROM
articles
WHERE
MATCH
(
title
,
body
)
AGAINST
(
"+show +will"
IN
BOOLEAN
MODE
);
SELECT
*
FROM
articles
WHERE
MATCH
(
title
,
body
)
AGAINST
(
'will'
);
select
@@
innodb_ft_user_stopword_table
;
# Define a correct formated user stopword table
# Define a correct format
t
ed user stopword table
create
table
user_stopword_1
(
value
varchar
(
30
))
engine
=
innodb
;
# The set operation should be successful
set
session
innodb_ft_user_stopword_table
=
"test/user_stopword_1"
;
...
...
@@ -620,7 +620,7 @@ SET SESSION innodb_ft_enable_stopword = 1;
SET
SESSION
innodb_ft_user_stopword_table
=
default
;
select
@@
innodb_ft_user_stopword_table
;
select
@@
innodb_ft_server_stopword_table
;
# Define a correct formated server stopword table
# Define a correct format
t
ed server stopword table
create
table
server_stopword
(
value
varchar
(
30
))
engine
=
innodb
;
# The set operation should be successful
SET
GLOBAL
innodb_ft_server_stopword_table
=
"test/server_stopword"
;
...
...
mysql-test/suite/innodb_fts/t/stopword.test
View file @
7c5609fb
...
...
@@ -38,7 +38,7 @@ SET @innodb_ft_user_stopword_table_orig=@@innodb_ft_user_stopword_table;
set
global
innodb_ft_server_stopword_table
=
"not_defined"
;
set
global
innodb_ft_server_stopword_table
=
NULL
;
# Define a correct formated user stopword table
# Define a correct format
t
ed user stopword table
create
table
user_stopword
(
value
varchar
(
30
))
engine
=
innodb
;
# The set operation should be successful
...
...
@@ -311,11 +311,11 @@ INSERT INTO articles (title,body) VALUES
# No records expeced for select
SELECT
*
FROM
articles
WHERE
MATCH
(
title
,
body
)
AGAINST
(
"+show +will"
IN
BOOLEAN
MODE
);
SELECT
*
FROM
articles
WHERE
MATCH
(
title
,
body
)
AGAINST
(
'will'
);
# Define a correct formated user stopword table
# Define a correct format
t
ed user stopword table
create
table
user_stopword
(
value
varchar
(
30
))
engine
=
innodb
;
# The set operation should be successful
set
session
innodb_ft_user_stopword_table
=
"test/user_stopword"
;
# Define a correct formated server stopword table
# Define a correct format
t
ed server stopword table
create
table
server_stopword
(
value
varchar
(
30
))
engine
=
innodb
;
# The set operation should be successful
set
global
innodb_ft_server_stopword_table
=
"test/server_stopword"
;
...
...
@@ -411,7 +411,7 @@ INSERT INTO articles (title,body) VALUES
# No records expeced for select
SELECT
*
FROM
articles
WHERE
MATCH
(
title
,
body
)
AGAINST
(
"+show +will"
IN
BOOLEAN
MODE
);
SELECT
*
FROM
articles
WHERE
MATCH
(
title
,
body
)
AGAINST
(
'will'
);
# Define a correct formated user stopword table
# Define a correct format
t
ed user stopword table
create
table
user_stopword
(
value
varchar
(
30
))
engine
=
innodb
;
# The set operation should be successful
set
session
innodb_ft_user_stopword_table
=
"test/user_stopword"
;
...
...
@@ -433,7 +433,7 @@ SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('mysqld');
# set user stopword list empty
set
session
innodb_ft_user_stopword_table
=
default
;
# Define a correct formated user stopword table
# Define a correct format
t
ed user stopword table
create
table
server_stopword
(
value
varchar
(
30
))
engine
=
innodb
;
# The set operation should be successful
set
global
innodb_ft_server_stopword_table
=
"test/server_stopword"
;
...
...
@@ -572,7 +572,7 @@ SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('"the will"@11' IN BOOL
--
echo
"In connection 1"
--
connection
con1
SET
SESSION
innodb_ft_enable_stopword
=
1
;
# Define a correct formated user stopword table
# Define a correct format
t
ed user stopword table
create
table
user_stopword
(
value
varchar
(
30
))
engine
=
innodb
;
# The set operation should be successful
set
session
innodb_ft_user_stopword_table
=
"test/user_stopword"
;
...
...
@@ -592,7 +592,7 @@ SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('will');
SELECT
*
FROM
articles
WHERE
MATCH
(
title
,
body
)
AGAINST
(
"+show +will"
IN
BOOLEAN
MODE
);
SELECT
*
FROM
articles
WHERE
MATCH
(
title
,
body
)
AGAINST
(
'will'
);
select
@@
innodb_ft_user_stopword_table
;
# Define a correct formated user stopword table
# Define a correct format
t
ed user stopword table
create
table
user_stopword_1
(
value
varchar
(
30
))
engine
=
innodb
;
# The set operation should be successful
set
session
innodb_ft_user_stopword_table
=
"test/user_stopword_1"
;
...
...
@@ -614,7 +614,7 @@ SET SESSION innodb_ft_enable_stopword = 1;
SET
SESSION
innodb_ft_user_stopword_table
=
default
;
select
@@
innodb_ft_user_stopword_table
;
select
@@
innodb_ft_server_stopword_table
;
# Define a correct formated server stopword table
# Define a correct format
t
ed server stopword table
create
table
server_stopword
(
value
varchar
(
30
))
engine
=
innodb
;
# The set operation should be successful
SET
GLOBAL
innodb_ft_server_stopword_table
=
"test/server_stopword"
;
...
...
mysql-test/suite/parts/t/partition_repair_myisam.test
View file @
7c5609fb
...
...
@@ -150,7 +150,7 @@ while ($i)
# 2 - after _mi_mark_file_changed (only marked index as opened)
# 3 - after write_record (updated datafile + not closed/updated index)
# 4 - after flush_cached_blocks (updated index/datafiles, not closed index)
# 5 - (Not used) after mi_state_info_write (fully up
p
dated/closed index file)
# 5 - (Not used) after mi_state_info_write (fully updated/closed index file)
# (this was verified to be a harmless crash, since everything was written)
# 6 - partly updated datafile (insert 6 small records, delete 5,3,1,
# insert one larger record (2.5 X small) and break in gdb before it has
...
...
storage/connect/value.cpp
View file @
7c5609fb
...
...
@@ -1199,7 +1199,7 @@ bool TYPVAL<TYPE>::Compall(PGLOBAL g, PVAL *vp, int np, OPVAL op)
/***********************************************************************/
/* FormatValue: This function set vp (a STRING value) to the string */
/* constructed from its own value format
ed using the fmt format.
*/
/* constructed from its own value format
ted using the fmt format.
*/
/* This function assumes that the format matches the value type. */
/***********************************************************************/
template
<
class
TYPE
>
...
...
@@ -1711,7 +1711,7 @@ bool TYPVAL<PSZ>::Compute(PGLOBAL g, PVAL *vp, int np, OPVAL op)
/***********************************************************************/
/* FormatValue: This function set vp (a STRING value) to the string */
/* constructed from its own value format
ed using the fmt format.
*/
/* constructed from its own value format
ted using the fmt format.
*/
/* This function assumes that the format matches the value type. */
/***********************************************************************/
bool
TYPVAL
<
PSZ
>::
FormatValue
(
PVAL
vp
,
PCSZ
fmt
)
...
...
@@ -2325,7 +2325,7 @@ bool BINVAL::IsEqual(PVAL vp, bool chktype)
/***********************************************************************/
/* FormatValue: This function set vp (a STRING value) to the string */
/* constructed from its own value format
ed using the fmt format.
*/
/* constructed from its own value format
ted using the fmt format.
*/
/* This function assumes that the format matches the value type. */
/***********************************************************************/
bool
BINVAL
::
FormatValue
(
PVAL
vp
,
PCSZ
fmt
)
...
...
@@ -2864,7 +2864,7 @@ bool DTVAL::WeekNum(PGLOBAL g, int& nval)
/***********************************************************************/
/* FormatValue: This function set vp (a STRING value) to the string */
/* constructed from its own value format
ed using the fmt format.
*/
/* constructed from its own value format
ted using the fmt format.
*/
/* This function assumes that the format matches the value type. */
/***********************************************************************/
bool
DTVAL
::
FormatValue
(
PVAL
vp
,
PCSZ
fmt
)
...
...
storage/innobase/row/row0row.cc
View file @
7c5609fb
...
...
@@ -1191,7 +1191,7 @@ row_raw_format_int(
ulint
buf_size
,
/*!< in: output buffer size
in bytes */
ibool
*
format_in_hex
)
/*!< out: should the data be
formated in hex */
format
t
ed in hex */
{
ulint
ret
;
...
...
@@ -1239,7 +1239,7 @@ row_raw_format_str(
ulint
buf_size
,
/*!< in: output buffer size
in bytes */
ibool
*
format_in_hex
)
/*!< out: should the data be
formated in hex */
format
t
ed in hex */
{
ulint
charset_coll
;
...
...
storage/maria/ma_locking.c
View file @
7c5609fb
...
...
@@ -280,7 +280,7 @@ int _ma_readinfo(register MARIA_HA *info __attribute__ ((unused)),
/*
Every isam-function that up
p
dates the isam-database MUST end with this
Every isam-function that updates the isam-database MUST end with this
request
NOTES
...
...
storage/maria/ma_loghandler.c
View file @
7c5609fb
...
...
@@ -956,7 +956,7 @@ char *translog_filename_by_fileno(uint32 file_no, char *path)
DBUG_ENTER
(
"translog_filename_by_fileno"
);
DBUG_ASSERT
(
file_no
<=
0xfffffff
);
/* log_descriptor.directory is already formated */
/* log_descriptor.directory is already format
t
ed */
end
=
strxmov
(
path
,
log_descriptor
.
directory
,
"aria_log.0000000"
,
NullS
);
length
=
(
uint
)
(
int10_to_str
(
file_no
,
buff
,
10
)
-
buff
);
strmov
(
end
-
length
+
1
,
buff
);
...
...
storage/myisam/mi_locking.c
View file @
7c5609fb
...
...
@@ -506,7 +506,7 @@ int _mi_readinfo(register MI_INFO *info, int lock_type, int check_keybuffer)
/*
Every isam-function that up
p
dates the isam-database MUST end with this
Every isam-function that updates the isam-database MUST end with this
request
*/
...
...
storage/rocksdb/ha_rocksdb.cc
View file @
7c5609fb
...
...
@@ -7696,7 +7696,7 @@ int rdb_split_normalized_tablename(const std::string &fullname,
into MyRocks Data Dictionary
The method is called during create table/partition, truncate table/partition
@param table_name IN table's name formated as
@param table_name IN table's name format
t
ed as
'dbname.tablename'
@param table_arg IN sql table
@param auto_increment_value IN specified table's auto increment value
...
...
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