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
a6abf20f
Commit
a6abf20f
authored
Jul 20, 2007
by
kostja@bodhi.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the coding style.
parent
6352d006
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
31 deletions
+31
-31
sql/sql_lex.cc
sql/sql_lex.cc
+9
-9
sql/sql_lex.h
sql/sql_lex.h
+22
-22
No files found.
sql/sql_lex.cc
View file @
a6abf20f
...
@@ -124,7 +124,7 @@ Lex_input_stream::Lex_input_stream(THD *thd,
...
@@ -124,7 +124,7 @@ Lex_input_stream::Lex_input_stream(THD *thd,
m_tok_start_prev
(
NULL
),
m_tok_start_prev
(
NULL
),
m_buf
(
buffer
),
m_buf
(
buffer
),
m_buf_length
(
length
),
m_buf_length
(
length
),
m_echo
(
true
),
m_echo
(
TRUE
),
m_cpp_tok_start
(
NULL
),
m_cpp_tok_start
(
NULL
),
m_cpp_tok_start_prev
(
NULL
),
m_cpp_tok_start_prev
(
NULL
),
m_cpp_tok_end
(
NULL
),
m_cpp_tok_end
(
NULL
),
...
@@ -1200,7 +1200,7 @@ int MYSQLlex(void *arg, void *yythd)
...
@@ -1200,7 +1200,7 @@ int MYSQLlex(void *arg, void *yythd)
{
{
lip
->
in_comment
=
DISCARD_COMMENT
;
lip
->
in_comment
=
DISCARD_COMMENT
;
/* Accept '/' '*' '!', but do not keep this marker. */
/* Accept '/' '*' '!', but do not keep this marker. */
lip
->
set_echo
(
false
);
lip
->
set_echo
(
FALSE
);
lip
->
yySkip
();
lip
->
yySkip
();
lip
->
yySkip
();
lip
->
yySkip
();
lip
->
yySkip
();
lip
->
yySkip
();
...
@@ -1233,7 +1233,7 @@ int MYSQLlex(void *arg, void *yythd)
...
@@ -1233,7 +1233,7 @@ int MYSQLlex(void *arg, void *yythd)
if
(
version
<=
MYSQL_VERSION_ID
)
if
(
version
<=
MYSQL_VERSION_ID
)
{
{
/* Expand the content of the special comment as real code */
/* Expand the content of the special comment as real code */
lip
->
set_echo
(
true
);
lip
->
set_echo
(
TRUE
);
state
=
MY_LEX_START
;
state
=
MY_LEX_START
;
break
;
break
;
}
}
...
@@ -1241,7 +1241,7 @@ int MYSQLlex(void *arg, void *yythd)
...
@@ -1241,7 +1241,7 @@ int MYSQLlex(void *arg, void *yythd)
else
else
{
{
state
=
MY_LEX_START
;
state
=
MY_LEX_START
;
lip
->
set_echo
(
true
);
lip
->
set_echo
(
TRUE
);
break
;
break
;
}
}
}
}
...
@@ -1261,7 +1261,7 @@ int MYSQLlex(void *arg, void *yythd)
...
@@ -1261,7 +1261,7 @@ int MYSQLlex(void *arg, void *yythd)
if
(
!
lip
->
eof
())
if
(
!
lip
->
eof
())
lip
->
yySkip
();
// remove last '/'
lip
->
yySkip
();
// remove last '/'
state
=
MY_LEX_START
;
// Try again
state
=
MY_LEX_START
;
// Try again
lip
->
set_echo
(
true
);
lip
->
set_echo
(
TRUE
);
break
;
break
;
case
MY_LEX_END_LONG_COMMENT
:
case
MY_LEX_END_LONG_COMMENT
:
if
((
lip
->
in_comment
!=
NO_COMMENT
)
&&
lip
->
yyPeek
()
==
'/'
)
if
((
lip
->
in_comment
!=
NO_COMMENT
)
&&
lip
->
yyPeek
()
==
'/'
)
...
@@ -1272,7 +1272,7 @@ int MYSQLlex(void *arg, void *yythd)
...
@@ -1272,7 +1272,7 @@ int MYSQLlex(void *arg, void *yythd)
lip
->
set_echo
(
lip
->
in_comment
==
PRESERVE_COMMENT
);
lip
->
set_echo
(
lip
->
in_comment
==
PRESERVE_COMMENT
);
lip
->
yySkipn
(
2
);
lip
->
yySkipn
(
2
);
/* And start recording the tokens again */
/* And start recording the tokens again */
lip
->
set_echo
(
true
);
lip
->
set_echo
(
TRUE
);
lip
->
in_comment
=
NO_COMMENT
;
lip
->
in_comment
=
NO_COMMENT
;
state
=
MY_LEX_START
;
state
=
MY_LEX_START
;
}
}
...
@@ -1297,7 +1297,7 @@ int MYSQLlex(void *arg, void *yythd)
...
@@ -1297,7 +1297,7 @@ int MYSQLlex(void *arg, void *yythd)
lip
->
found_semicolon
=
lip
->
get_ptr
();
lip
->
found_semicolon
=
lip
->
get_ptr
();
thd
->
server_status
|=
SERVER_MORE_RESULTS_EXISTS
;
thd
->
server_status
|=
SERVER_MORE_RESULTS_EXISTS
;
lip
->
next_state
=
MY_LEX_END
;
lip
->
next_state
=
MY_LEX_END
;
lip
->
set_echo
(
true
);
lip
->
set_echo
(
TRUE
);
return
(
END_OF_INPUT
);
return
(
END_OF_INPUT
);
}
}
state
=
MY_LEX_CHAR
;
// Return ';'
state
=
MY_LEX_CHAR
;
// Return ';'
...
@@ -1309,9 +1309,9 @@ int MYSQLlex(void *arg, void *yythd)
...
@@ -1309,9 +1309,9 @@ int MYSQLlex(void *arg, void *yythd)
if
(
lip
->
eof
())
if
(
lip
->
eof
())
{
{
lip
->
yyUnget
();
// Reject the last '\0'
lip
->
yyUnget
();
// Reject the last '\0'
lip
->
set_echo
(
false
);
lip
->
set_echo
(
FALSE
);
lip
->
yySkip
();
lip
->
yySkip
();
lip
->
set_echo
(
true
);
lip
->
set_echo
(
TRUE
);
lip
->
next_state
=
MY_LEX_END
;
// Mark for next loop
lip
->
next_state
=
MY_LEX_END
;
// Mark for next loop
return
(
END_OF_INPUT
);
return
(
END_OF_INPUT
);
}
}
...
...
sql/sql_lex.h
View file @
a6abf20f
...
@@ -1239,19 +1239,19 @@ class Lex_input_stream
...
@@ -1239,19 +1239,19 @@ class Lex_input_stream
}
}
/** Get the raw query buffer. */
/** Get the raw query buffer. */
const
char
*
get_buf
()
const
char
*
get_buf
()
{
{
return
m_buf
;
return
m_buf
;
}
}
/** Get the pre-processed query buffer. */
/** Get the pre-processed query buffer. */
const
char
*
get_cpp_buf
()
const
char
*
get_cpp_buf
()
{
{
return
m_cpp_buf
;
return
m_cpp_buf
;
}
}
/** Get the end of the raw query buffer. */
/** Get the end of the raw query buffer. */
const
char
*
get_end_of_query
()
const
char
*
get_end_of_query
()
{
{
return
m_end_of_query
;
return
m_end_of_query
;
}
}
...
@@ -1279,43 +1279,43 @@ class Lex_input_stream
...
@@ -1279,43 +1279,43 @@ class Lex_input_stream
}
}
/** Get the token start position, in the raw buffer. */
/** Get the token start position, in the raw buffer. */
const
char
*
get_tok_start
()
const
char
*
get_tok_start
()
{
{
return
m_tok_start
;
return
m_tok_start
;
}
}
/** Get the token start position, in the pre-processed buffer. */
/** Get the token start position, in the pre-processed buffer. */
const
char
*
get_cpp_tok_start
()
const
char
*
get_cpp_tok_start
()
{
{
return
m_cpp_tok_start
;
return
m_cpp_tok_start
;
}
}
/** Get the token end position, in the raw buffer. */
/** Get the token end position, in the raw buffer. */
const
char
*
get_tok_end
()
const
char
*
get_tok_end
()
{
{
return
m_tok_end
;
return
m_tok_end
;
}
}
/** Get the token end position, in the pre-processed buffer. */
/** Get the token end position, in the pre-processed buffer. */
const
char
*
get_cpp_tok_end
()
const
char
*
get_cpp_tok_end
()
{
{
return
m_cpp_tok_end
;
return
m_cpp_tok_end
;
}
}
/** Get the previous token start position, in the raw buffer. */
/** Get the previous token start position, in the raw buffer. */
const
char
*
get_tok_start_prev
()
const
char
*
get_tok_start_prev
()
{
{
return
m_tok_start_prev
;
return
m_tok_start_prev
;
}
}
/** Get the current stream pointer, in the raw buffer. */
/** Get the current stream pointer, in the raw buffer. */
const
char
*
get_ptr
()
const
char
*
get_ptr
()
{
{
return
m_ptr
;
return
m_ptr
;
}
}
/** Get the current stream pointer, in the pre-processed buffer. */
/** Get the current stream pointer, in the pre-processed buffer. */
const
char
*
get_cpp_ptr
()
const
char
*
get_cpp_ptr
()
{
{
return
m_cpp_ptr
;
return
m_cpp_ptr
;
}
}
...
@@ -1365,22 +1365,22 @@ class Lex_input_stream
...
@@ -1365,22 +1365,22 @@ class Lex_input_stream
private:
private:
/** Pointer to the current position in the raw input stream. */
/** Pointer to the current position in the raw input stream. */
const
char
*
m_ptr
;
const
char
*
m_ptr
;
/** Starting position of the last token parsed, in the raw buffer. */
/** Starting position of the last token parsed, in the raw buffer. */
const
char
*
m_tok_start
;
const
char
*
m_tok_start
;
/** Ending position of the previous token parsed, in the raw buffer. */
/** Ending position of the previous token parsed, in the raw buffer. */
const
char
*
m_tok_end
;
const
char
*
m_tok_end
;
/** End of the query text in the input stream, in the raw buffer. */
/** End of the query text in the input stream, in the raw buffer. */
const
char
*
m_end_of_query
;
const
char
*
m_end_of_query
;
/** Starting position of the previous token parsed, in the raw buffer. */
/** Starting position of the previous token parsed, in the raw buffer. */
const
char
*
m_tok_start_prev
;
const
char
*
m_tok_start_prev
;
/** Begining of the query text in the input stream, in the raw buffer. */
/** Begining of the query text in the input stream, in the raw buffer. */
const
char
*
m_buf
;
const
char
*
m_buf
;
/** Length of the raw buffer. */
/** Length of the raw buffer. */
uint
m_buf_length
;
uint
m_buf_length
;
...
@@ -1389,28 +1389,28 @@ class Lex_input_stream
...
@@ -1389,28 +1389,28 @@ class Lex_input_stream
bool
m_echo
;
bool
m_echo
;
/** Pre-processed buffer. */
/** Pre-processed buffer. */
char
*
m_cpp_buf
;
char
*
m_cpp_buf
;
/** Pointer to the current position in the pre-processed input stream. */
/** Pointer to the current position in the pre-processed input stream. */
char
*
m_cpp_ptr
;
char
*
m_cpp_ptr
;
/**
/**
Starting position of the last token parsed,
Starting position of the last token parsed,
in the pre-processed buffer.
in the pre-processed buffer.
*/
*/
const
char
*
m_cpp_tok_start
;
const
char
*
m_cpp_tok_start
;
/**
/**
Starting position of the previous token parsed,
Starting position of the previous token parsed,
in the pre-procedded buffer.
in the pre-procedded buffer.
*/
*/
const
char
*
m_cpp_tok_start_prev
;
const
char
*
m_cpp_tok_start_prev
;
/**
/**
Ending position of the previous token parsed,
Ending position of the previous token parsed,
in the pre-processed buffer.
in the pre-processed buffer.
*/
*/
const
char
*
m_cpp_tok_end
;
const
char
*
m_cpp_tok_end
;
/** UTF8-body buffer created during parsing. */
/** UTF8-body buffer created during parsing. */
char
*
m_body_utf8
;
char
*
m_body_utf8
;
...
@@ -1433,7 +1433,7 @@ class Lex_input_stream
...
@@ -1433,7 +1433,7 @@ class Lex_input_stream
Position of ';' in the stream, to delimit multiple queries.
Position of ';' in the stream, to delimit multiple queries.
This delimiter is in the raw buffer.
This delimiter is in the raw buffer.
*/
*/
const
char
*
found_semicolon
;
const
char
*
found_semicolon
;
/** SQL_MODE = IGNORE_SPACE. */
/** SQL_MODE = IGNORE_SPACE. */
bool
ignore_space
;
bool
ignore_space
;
...
...
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