diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-05 01:04:08 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-05 01:04:08 +0200 |
| commit | d18a6cc33a220e056dfa1633b928ac0b1415789d (patch) | |
| tree | 1750cfa3cfd660f20d5055a78caff42a53363247 /client/client_priv.h | |
| parent | cec36f0f14b6c885aabe4eb989fb9ff4a4ae6a7c (diff) | |
| download | mariadb-git-d18a6cc33a220e056dfa1633b928ac0b1415789d.tar.gz | |
Fixes up things after merge from 3.23.44
Portability fixes.
Don't delete temporary tables on FLUSH tables.
client/client_priv.h:
Fix after merge
client/mysqldump.c:
Fix after merge
include/my_global.h:
Change CMP -> CMP_NUM because CMP was used in other places
include/violite.h:
Added missing prototype
myisam/ft_boolean_search.c:
Removed warnings
myisam/ft_nlq_search.c:
Removed warnings
myisam/mi_search.c:
CMP -> CMP_NUM
mysql-test/mysql-test-run.sh:
Write all logs to log directory
mysql-test/r/func_time.result:
Fix test results after merge
mysql-test/r/having.result:
Fix test results after merge
mysql-test/r/join.result:
Fix test results after merge
mysql-test/r/rpl000012.result:
Fix test results after merge
mysys/mf_iocache.c:
Allow multiple call to end_iocache.
sql/ha_innobase.cc:
Removed possible problem with using uninitialized variable
sql/log_event.cc:
Don't delete temporary tables on FLUSH tables.
(Needs to be fixed properly)
Diffstat (limited to 'client/client_priv.h')
| -rw-r--r-- | client/client_priv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index 79c03c3dc07..830a67f3a7e 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -30,4 +30,5 @@ enum options { OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET, OPT_PAGER, OPT_NOPAGER, OPT_TEE, OPT_NOTEE, OPT_LOW_PRIORITY, OPT_AUTO_REPAIR, OPT_COMPRESS, OPT_DROP, OPT_LOCKS, OPT_KEYWORDS, OPT_DELAYED, OPT_OPTIMIZE, - OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES}; + OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES, + OPT_MASTER_DATA, OPT_AUTOCOMMIT}; |