diff options
author | unknown <monty@hundin.mysql.fi> | 2001-08-14 20:33:49 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-08-14 20:33:49 +0300 |
commit | 410dd0779c32b1975eceeab92a1e62ff099f37db (patch) | |
tree | 63b1bcf87d376e768395f4a058416187ee0aad95 /sql/sql_lex.h | |
parent | 97250b9c40a378659c6c4423461021231a3b551d (diff) | |
download | mariadb-git-410dd0779c32b1975eceeab92a1e62ff099f37db.tar.gz |
Remove warnings and portability fixes
New global read lock code
Fixed bug in DATETIME with WHERE optimization
Made UNION code more general.
include/global.h:
Remove warning on Linux Alpha
include/mysql_com.h:
Move some C variables inside extern "C" block.
include/mysqld_error.h:
New error mesages
myisam/mi_write.c:
cleanup
mysql-test/r/select.result:
Fix because of table lists now always has a database argument.
mysql-test/r/type_datetime.result:
Test for bug with datetime and where optimization
mysql-test/r/union.result:
Updated result
mysql-test/t/type_datetime.test:
New test for datetime
mysql-test/t/union.test:
More testing of error conditions
sql/item_sum.cc:
Remove warnings on Linux Alpha
sql/item_sum.h:
Cleanup
sql/lock.cc:
Cleaned up global lock handling
sql/log_event.cc:
Removed default arguments from declarations (not allowed in cxx)
sql/mysql_priv.h:
New prototypes
sql/mysqld.cc:
Fix for global locks
sql/opt_range.cc:
Cleanup
sql/share/czech/errmsg.txt:
New errors
sql/share/danish/errmsg.txt:
New errors
sql/share/dutch/errmsg.txt:
New errors
sql/share/english/errmsg.txt:
New errors
sql/share/estonian/errmsg.txt:
New errors
sql/share/french/errmsg.txt:
New errors
sql/share/german/errmsg.txt:
New errors
sql/share/greek/errmsg.txt:
New errors
sql/share/hungarian/errmsg.txt:
New errors
sql/share/italian/errmsg.txt:
New errors
sql/share/japanese/errmsg.txt:
New errors
sql/share/korean/errmsg.txt:
New errors
sql/share/norwegian-ny/errmsg.txt:
New errors
sql/share/norwegian/errmsg.txt:
New errors
sql/share/polish/errmsg.txt:
New errors
sql/share/portuguese/errmsg.txt:
New errors
sql/share/romanian/errmsg.txt:
New errors
sql/share/russian/errmsg.txt:
New errors
sql/share/slovak/errmsg.txt:
New errors
sql/share/spanish/errmsg.txt:
New errors
sql/share/swedish/errmsg.OLD:
New errors
sql/share/swedish/errmsg.txt:
New errors
sql/sql_acl.cc:
Use thd->host_or_ip
sql/sql_class.cc:
Use new global lock code
sql/sql_class.h:
host_or_ip
sql/sql_db.cc:
host_or_ip
sql/sql_delete.cc:
Use now global lock code
sql/sql_lex.h:
Cleanup of not used states and variables
sql/sql_parse.cc:
Use now global locks.
Made UNION code more general.
Change to use thd->hosts_or_ip.
TABLE_LIST now always has 'db' set.
sql/sql_repl.cc:
Portability fixes.
Changed wrong usage of my_vsnprintf -> my_snprintf
sql/sql_select.cc:
Changes for UNION
sql/sql_show.cc:
Cleanup
sql/sql_union.cc:
Handle 'select_result' outside of mysql_union().
sql/sql_yacc.yy:
Fixes for union
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r-- | sql/sql_lex.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index ef32dca6fc8..4d2441da246 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -55,8 +55,8 @@ enum enum_sql_command { SQLCOM_RESET, SQLCOM_PURGE, SQLCOM_SHOW_BINLOGS, SQLCOM_SHOW_OPEN_TABLES, SQLCOM_LOAD_MASTER_DATA, SQLCOM_HA_OPEN, SQLCOM_HA_CLOSE, SQLCOM_HA_READ, - SQLCOM_SHOW_SLAVE_HOSTS, SQLCOM_MULTI_DELETE, SQLCOM_UNION_SELECT, - SQLCOM_SHOW_BINLOG_EVENTS, SQLCOM_SHOW_NEW_MASTER, SQLCOM_NONE + SQLCOM_SHOW_SLAVE_HOSTS, SQLCOM_MULTI_DELETE, + SQLCOM_SHOW_BINLOG_EVENTS, SQLCOM_SHOW_NEW_MASTER, }; enum lex_states { STATE_START, STATE_CHAR, STATE_IDENT, @@ -106,7 +106,6 @@ enum sub_select_type {UNSPECIFIED_TYPE,UNION_TYPE, INTERSECT_TYPE, EXCEPT_TYPE}; typedef struct st_select_lex { enum sub_select_type linkage; - uint select_number; /* For Item_select */ char *db,*db1,*table1,*db2,*table2; /* For outer join using .. */ Item *where,*having; ha_rows select_limit,offset_limit; |