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
9897da4c
Commit
9897da4c
authored
Jul 03, 2001
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
BitKeeper/etc/logging_ok: auto-union
parents
2da39d84
ac3219dc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
.bzrignore
.bzrignore
+2
-0
sql/item_func.cc
sql/item_func.cc
+3
-2
No files found.
.bzrignore
View file @
9897da4c
...
@@ -287,3 +287,5 @@ support-files/mysql.server
...
@@ -287,3 +287,5 @@ support-files/mysql.server
support-files/mysql.spec
support-files/mysql.spec
tags
tags
tmp/*
tmp/*
myisam/test1.MYD
myisam/test1.MYI
sql/item_func.cc
View file @
9897da4c
...
@@ -1951,6 +1951,9 @@ bool Item_func_match::fix_fields(THD *thd,struct st_table_list *tlist)
...
@@ -1951,6 +1951,9 @@ bool Item_func_match::fix_fields(THD *thd,struct st_table_list *tlist)
List_iterator
<
Item
>
li
(
fields
);
List_iterator
<
Item
>
li
(
fields
);
Item
*
item
;
Item
*
item
;
maybe_null
=
1
;
join_key
=
0
;
/* Why testing for const_item ? Monty */
/* Why testing for const_item ? Monty */
/* I'll remove it later, but this should include modifications to
/* I'll remove it later, but this should include modifications to
find_best and auto_close as complement to auto_init code above. SerG */
find_best and auto_close as complement to auto_init code above. SerG */
...
@@ -2044,8 +2047,6 @@ bool Item_func_match::fix_index()
...
@@ -2044,8 +2047,6 @@ bool Item_func_match::fix_index()
continue
;
continue
;
this
->
key
=
ft_to_key
[
key
];
this
->
key
=
ft_to_key
[
key
];
maybe_null
=
1
;
join_key
=
0
;
return
0
;
return
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