diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-01-17 20:42:27 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-01-17 20:42:27 -0700 |
| commit | d303c5054b6044efbd8afec4152b5ca463c558ec (patch) | |
| tree | 6c3224c43c82dec6ea4c8200bc7a103ca43e1060 /sql/lex.h | |
| parent | 9fe53deabd334fbf3618add57d7c95abd2490203 (diff) | |
| parent | d06404c43f24cded1bdbe1e720c2314d934aa2de (diff) | |
| download | mariadb-git-d303c5054b6044efbd8afec4152b5ca463c558ec.tar.gz | |
semi-manual merge, some more needs to be fixed in mysqltest.c in fully
manual mode
mysql-test/mysql-test-run.sh:
Auto merged
sql/lex.h:
Auto merged
Docs/manual.texi:
merged
client/mysqltest.c:
merged
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h index dd691f29bbc..946cba49bce 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -398,6 +398,8 @@ static SYMBOL sql_functions[] = { { "LOWER", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_lcase)}, { "LPAD", SYM(FUNC_ARG3),0,CREATE_FUNC(create_func_lpad)}, { "LTRIM", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_ltrim)}, + { "MASTER_POS_WAIT", SYM(FUNC_ARG2),0, + CREATE_FUNC(create_wait_for_master_pos)}, { "MAKE_SET", SYM(MAKE_SET_SYM),0,0}, { "MAX", SYM(MAX_SYM),0,0}, { "MD5", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_md5)}, |