diff options
author | unknown <monty@mysql.com> | 2003-11-23 14:36:41 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2003-11-23 14:36:41 +0200 |
commit | ce44db9fb1fc20133e05cab5cd99195c814f3b05 (patch) | |
tree | df2c427c1d086dc0727fa8656815cece6df4aeb2 /include | |
parent | b1a563c39233b6af3939f23e4b50d89d7b28a74a (diff) | |
download | mariadb-git-ce44db9fb1fc20133e05cab5cd99195c814f3b05.tar.gz |
Fixed compiler warnings from Intel compiler in Win64
Added option --max-record-length=# to myisamchk
Don't try repair twice if doing myisamchk --repair --force
Shared memory handler didn't clean up things on errors or shutdown
VC++Files/libmysqltest/mytest.c:
Fixed compiler warnings from Intel compiler
include/myisam.h:
Added option --max-record-length=# to myisamchk
include/mysql_com.h:
Fixed compiler warnings from Intel compiler
innobase/btr/btr0btr.c:
Fixed compiler warnings from Intel compiler
innobase/btr/btr0cur.c:
Fixed compiler warnings from Intel compiler
innobase/include/btr0btr.ic:
Fixed compiler warnings from Intel compiler
innobase/include/buf0buf.ic:
Fixed compiler warnings from Intel compiler
innobase/include/row0sel.ic:
Fixed compiler warnings from Intel compiler
innobase/include/row0upd.ic:
Fixed compiler warnings from Intel compiler
innobase/include/trx0rseg.ic:
Fixed compiler warnings from Intel compiler
innobase/pars/pars0opt.c:
Fixed compiler warnings from Intel compiler
innobase/que/que0que.c:
Fixed compiler warnings from Intel compiler
myisam/mi_check.c:
Added option --max-record-length=# to myisamchk
Better error messages
myisam/myisamchk.c:
Added option --max-record-length=# to myisamchk
Don't try repair twice if doing myisamchk --repair --force
mysql-test/r/create.result:
Updated test results
mysql-test/t/create.test:
Better initialization
sql/ha_innodb.cc:
Fixed compiler warnings from Intel compiler
sql/item_func.cc:
Fixed compiler warnings from Intel compiler
sql/mysqld.cc:
Fixed compiler warnings from Intel compiler
Cleaned up handle_connections_shared_memory
Shared memory handler didn't clean up things on errors or shutdown
strings/bmove512.c:
Fixed compiler warnings from Intel compiler
Diffstat (limited to 'include')
-rw-r--r-- | include/myisam.h | 1 | ||||
-rw-r--r-- | include/mysql_com.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/myisam.h b/include/myisam.h index 613a9965832..2285f996464 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -318,6 +318,7 @@ typedef struct st_mi_check_param ulonglong auto_increment_value; ulonglong max_data_file_length; ulonglong keys_in_use; + ulonglong max_record_length; my_off_t search_after_block; my_off_t new_file_pos,key_file_blocks; my_off_t keydata,totaldata,key_blocks,start_check_pos; diff --git a/include/mysql_com.h b/include/mysql_com.h index 3031b883e98..39e9c48146d 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -118,7 +118,7 @@ enum enum_server_command #define CLIENT_SECURE_CONNECTION 32768 /* New 4.1 authentication */ #define CLIENT_MULTI_STATEMENTS 65536 /* Enable/disable multi-stmt support */ #define CLIENT_MULTI_RESULTS 131072 /* Enable/disable multi-results */ -#define CLIENT_REMEMBER_OPTIONS (1L << 31) +#define CLIENT_REMEMBER_OPTIONS ((ulong) (1L << 31)) #define SERVER_STATUS_IN_TRANS 1 /* Transaction has started */ #define SERVER_STATUS_AUTOCOMMIT 2 /* Server in auto_commit mode */ |