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 /include | |
| 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 'include')
| -rw-r--r-- | include/global.h | 6 | ||||
| -rw-r--r-- | include/mysql_com.h | 6 | ||||
| -rw-r--r-- | include/mysqld_error.h | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/include/global.h b/include/global.h index c7a3498b76a..d40c5373812 100644 --- a/include/global.h +++ b/include/global.h @@ -781,9 +781,9 @@ typedef union { *((uchar*) (T))= (uchar)(def_temp); \ *((uchar*) (T+1))=(uchar)((def_temp >> 8)); } #define int3store(T,A) { /*lint -save -e734 */\ - *((T))=(char) ((A));\ - *((T)+1)=(char) (((A) >> 8));\ - *((T)+2)=(char) (((A) >> 16)); \ + *((uchar*)(T))=(uchar) ((A));\ + *((uchar*) (T)+1)=(uchar) (((A) >> 8));\ + *((uchar*)(T)+2)=(uchar) (((A) >> 16)); \ /*lint -restore */} #define int4store(T,A) { *(T)=(char) ((A));\ *((T)+1)=(char) (((A) >> 8));\ diff --git a/include/mysql_com.h b/include/mysql_com.h index 2d1c5017922..126bb454501 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -146,15 +146,15 @@ enum enum_field_types { FIELD_TYPE_DECIMAL, FIELD_TYPE_TINY, #define FIELD_TYPE_CHAR FIELD_TYPE_TINY /* For compability */ #define FIELD_TYPE_INTERVAL FIELD_TYPE_ENUM /* For compability */ -extern unsigned long max_allowed_packet; -extern unsigned long net_buffer_length; - #define net_new_transaction(net) ((net)->pkt_nr=0) #ifdef __cplusplus extern "C" { #endif +extern unsigned long max_allowed_packet; +extern unsigned long net_buffer_length; + int my_net_init(NET *net, Vio* vio); void net_end(NET *net); void net_clear(NET *net); diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 22fbbeb0367..ab37065b761 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -217,4 +217,5 @@ #define ER_ERROR_WHEN_EXECUTING_COMMAND 1214 #define ER_WRONG_USAGE 1215 #define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1216 -#define ER_ERROR_MESSAGES 217 +#define ER_CANT_UPDATE_WITH_READLOCK 1217 +#define ER_ERROR_MESSAGES 218 |