diff options
| author | unknown <jani@hynda.mysql.fi> | 2007-09-27 20:00:40 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2007-09-27 20:00:40 +0300 |
| commit | 6f296a01ac39f7d10774fd3d93b5633f31ce99c7 (patch) | |
| tree | b1739519539f0be37309a5bf39efeb9b45e3d7f0 /sql | |
| parent | f4afcec393e9c75531220c1fe1f5d387891549fa (diff) | |
| download | mariadb-git-6f296a01ac39f7d10774fd3d93b5633f31ce99c7.tar.gz | |
Fixed merge problems.
BitKeeper/etc/ignore:
Added libmysql_r/client_settings.h libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc to the ignore list
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/slave.cc | 2 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 7 |
2 files changed, 0 insertions, 9 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 4c73853f5e8..fcbd4eb841b 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -29,8 +29,6 @@ #include <errmsg.h> #include <mysys_err.h> -static Log_event* next_event(RELAY_LOG_INFO* rli); - #ifdef HAVE_REPLICATION #include "rpl_tblmap.h" diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index a674a6702ed..92d938c6b79 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -4505,13 +4505,6 @@ create_table_option: Lex->create_info.transactional= ($3 != 0 ? HA_CHOICE_YES : HA_CHOICE_NO); } - - | TRANSACTIONAL_SYM opt_equal ulong_num - { - Lex->create_info.used_fields|= HA_CREATE_USED_TRANSACTIONAL; - Lex->create_info.transactional= ($3 != 0 ? HA_CHOICE_YES : - HA_CHOICE_NO); - } ; default_charset: |