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
b57f37d6
Commit
b57f37d6
authored
Mar 20, 2007
by
joerg@trift2
Browse files
Options
Browse Files
Download
Plain Diff
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into trift2.:/MySQL/M51/push-5.1
parents
8e209e93
f6c30190
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
5 deletions
+18
-5
include/my_global.h
include/my_global.h
+14
-1
netware/Makefile.am
netware/Makefile.am
+1
-1
sql/sql_yacc.yy
sql/sql_yacc.yy
+3
-3
No files found.
include/my_global.h
View file @
b57f37d6
...
@@ -1489,11 +1489,24 @@ do { doubleget_union _tmp; \
...
@@ -1489,11 +1489,24 @@ do { doubleget_union _tmp; \
#define dlerror() ""
#define dlerror() ""
#endif
#endif
#ifndef __NETWARE__
/*
/*
Include standard definitions of operator new and delete.
*
Include standard definitions of operator new and delete.
*/
*/
#ifdef __cplusplus
#ifdef __cplusplus
#include <new>
#include <new>
#endif
#endif
#else
/*
* Define placement versions of operator new and operator delete since
* we don't have <new> when building for Netware.
*/
#ifdef __cplusplus
inline
void
*
operator
new
(
size_t
,
void
*
ptr
)
{
return
ptr
;
}
inline
void
*
operator
new
[](
size_t
,
void
*
ptr
)
{
return
ptr
;
}
inline
void
operator
delete
(
void
*
,
void
*
)
{
/* Do nothing */
}
inline
void
operator
delete
[](
void
*
,
void
*
)
{
/* Do nothing */
}
#endif
#endif
#endif
/* my_global_h */
#endif
/* my_global_h */
netware/Makefile.am
View file @
b57f37d6
...
@@ -57,7 +57,7 @@ DISTCLEANFILES = $(BUILT_SOURCES)
...
@@ -57,7 +57,7 @@ DISTCLEANFILES = $(BUILT_SOURCES)
# Create the libmysql.imp from libmysql/libmysql.def
# Create the libmysql.imp from libmysql/libmysql.def
libmysql.imp
:
$(top_srcdir)/libmysql/libmysql.def
libmysql.imp
:
$(top_srcdir)/libmysql/libmysql.def
awk
'BEGIN{x=0;} \
$(AWK)
'BEGIN{x=0;} \
END{printf("\n");} \
END{printf("\n");} \
x==1 {printf(" %s",$$1); x++; next} \
x==1 {printf(" %s",$$1); x++; next} \
x>1 {printf(",\n %s", $$1); next} \
x>1 {printf(",\n %s", $$1); next} \
...
...
sql/sql_yacc.yy
View file @
b57f37d6
...
@@ -7561,13 +7561,13 @@ index_hint_definition:
...
@@ -7561,13 +7561,13 @@ index_hint_definition:
{
{
Select->set_index_hint_type($1, $3);
Select->set_index_hint_type($1, $3);
}
}
'(' key_usage_list ')'
;
'(' key_usage_list ')'
| USE_SYM key_or_index index_hint_clause
| USE_SYM key_or_index index_hint_clause
{
{
Select->set_index_hint_type(INDEX_HINT_USE, $3);
Select->set_index_hint_type(INDEX_HINT_USE, $3);
}
}
'(' opt_key_usage_list ')'
;
'(' opt_key_usage_list ')'
;
index_hints_list:
index_hints_list:
index_hint_definition
index_hint_definition
...
...
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