Below is the list of changes that have just been committed into a local
5.0 repository of jwinstead. When jwinstead does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.1954 05/06/18 01:55:42 jimw@stripped +12 -0
Clean up warnings and build problems on Windows. (Bug #11045)
sql/table.cc
1.171 05/06/18 01:54:57 jimw@stripped +3 -2
Add casts for handling key_part lengths
sql/sql_yacc.yy
1.400 05/06/18 01:54:50 jimw@stripped +1 -1
Remove unused variable
sql/sql_union.cc
1.121 05/06/18 01:54:37 jimw@stripped +3 -1
Cast value for number of rows to ha_rows
sql/sql_insert.cc
1.160 05/06/18 01:54:28 jimw@stripped +1 -1
Fix type of query id value
sql/sql_lex.h
1.185 05/06/18 01:54:18 jimw@stripped +1 -1
Fix size of options to be ulong again
sql/sql_lex.cc
1.151 05/06/18 01:53:56 jimw@stripped +5 -4
Add casts to fix type used for counting number of rows
sql/sql_acl.cc
1.160 05/06/18 01:53:50 jimw@stripped +0 -2
Remove unused variables
sql/item_strfunc.cc
1.233 05/06/18 01:53:44 jimw@stripped +0 -1
Remove unused variables
sql/ha_federated.cc
1.29 05/06/18 01:53:25 jimw@stripped +2 -7
Remove unused variables, fix type of variable used to store query id
sql/examples/ha_archive.h
1.21 05/06/18 01:53:12 jimw@stripped +3 -3
Fix variables used to store rows to ha_rows
sql/examples/ha_archive.cc
1.42 05/06/18 01:52:39 jimw@stripped +5 -5
Fix type for variables used to store number of rows
Add cast when reading current position
VC++Files/sql/mysqld.dsp
1.35 05/06/18 01:52:18 jimw@stripped +1 -1
Link debug server against debug yassl
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: jimw
# Host: production.mysql.com
# Root: /usersnfs/jwinstead/my/mysql-5.0-11045
--- 1.232/sql/item_strfunc.cc 2005-06-08 12:49:01 +02:00
+++ 1.233/sql/item_strfunc.cc 2005-06-18 01:53:44 +02:00
@@ -446,7 +446,6 @@
{
DBUG_ASSERT(fixed == 1);
#ifdef HAVE_OPENSSL
- DES_key_schedule ks1, ks2, ks3;
DES_cblock ivec;
struct st_des_keyblock keyblock;
struct st_des_keyschedule keyschedule;
--- 1.159/sql/sql_acl.cc 2005-06-09 22:11:47 +02:00
+++ 1.160/sql/sql_acl.cc 2005-06-18 01:53:50 +02:00
@@ -2476,7 +2476,6 @@
int old_row_exists= 1;
int error=0;
ulong store_proc_rights;
- byte *key;
DBUG_ENTER("replace_routine_table");
if (!initialized)
@@ -3216,7 +3215,6 @@
do
{
GRANT_NAME *mem_check;
- longlong proc_type;
HASH *hash;
if (!(mem_check=new GRANT_NAME(p_table)))
{
--- 1.159/sql/sql_insert.cc 2005-06-06 20:21:27 +02:00
+++ 1.160/sql/sql_insert.cc 2005-06-18 01:54:28 +02:00
@@ -192,7 +192,7 @@
List<Item> &update_fields)
{
TABLE *table= insert_table_list->table;
- ulong timestamp_query_id;
+ query_id_it timestamp_query_id;
LINT_INIT(timestamp_query_id);
/*
--- 1.150/sql/sql_lex.cc 2005-06-17 21:27:21 +02:00
+++ 1.151/sql/sql_lex.cc 2005-06-18 01:53:56 +02:00
@@ -1755,12 +1755,13 @@
void st_select_lex_unit::set_limit(SELECT_LEX *sl)
{
- ulonglong select_limit_val;
+ ha_rows select_limit_val;
DBUG_ASSERT(! thd->current_arena->is_stmt_prepare());
- select_limit_val= sl->select_limit ? sl->select_limit->val_uint() :
- HA_POS_ERROR;
- offset_limit_cnt= sl->offset_limit ? sl->offset_limit->val_uint() : ULL(0);
+ select_limit_val= (ha_rows)(sl->select_limit ? sl->select_limit->val_uint() :
+ HA_POS_ERROR);
+ offset_limit_cnt= (ha_rows)(sl->offset_limit ? sl->offset_limit->val_uint() :
+ ULL(0));
select_limit_cnt= select_limit_val + offset_limit_cnt;
if (select_limit_cnt < select_limit_val)
select_limit_cnt= HA_POS_ERROR; // no limit
--- 1.184/sql/sql_lex.h 2005-06-16 09:11:48 +02:00
+++ 1.185/sql/sql_lex.h 2005-06-18 01:54:18 +02:00
@@ -304,7 +304,7 @@
*link_next, **link_prev; /* list of whole SELECT_LEX */
public:
- ulonglong options;
+ ulong options;
/*
result of this query can't be cached, bit field, can be :
UNCACHEABLE_DEPENDENT
--- 1.399/sql/sql_yacc.yy 2005-06-17 21:27:21 +02:00
+++ 1.400/sql/sql_yacc.yy 2005-06-18 01:54:50 +02:00
@@ -5641,7 +5641,7 @@
ulong_num:
NUM { int error; $$= (ulong) my_strtoll10($1.str, (char**) 0, &error); }
- | HEX_NUM { int error; $$= (ulong) strtol($1.str, (char**) 0, 16); }
+ | HEX_NUM { $$= (ulong) strtol($1.str, (char**) 0, 16); }
| LONG_NUM { int error; $$= (ulong) my_strtoll10($1.str, (char**) 0, &error); }
| ULONGLONG_NUM { int error; $$= (ulong) my_strtoll10($1.str, (char**) 0, &error); }
| DECIMAL_NUM { int error; $$= (ulong) my_strtoll10($1.str, (char**) 0, &error); }
--- 1.170/sql/table.cc 2005-06-17 23:32:41 +02:00
+++ 1.171/sql/table.cc 2005-06-18 01:54:57 +02:00
@@ -745,8 +745,9 @@
error.
*/
keyinfo->key_length-= (key_part->length - field->key_length());
- key_part->store_length-= (key_part->length - field->key_length());
- key_part->length= field->key_length();
+ key_part->store_length-= (uint16)(key_part->length -
+ field->key_length());
+ key_part->length= (uint16)field->key_length();
sql_print_error("Found wrong key definition in %s; Please do \"ALTER TABLE '%s' FORCE \" to fix it!", name, share->table_name);
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
ER_CRASHED_ON_USAGE,
--- 1.120/sql/sql_union.cc 2005-06-15 19:58:23 +02:00
+++ 1.121/sql/sql_union.cc 2005-06-18 01:54:37 +02:00
@@ -448,7 +448,9 @@
table->no_keyread=1;
}
res= sl->join->error;
- offset_limit_cnt= sl->offset_limit ? sl->offset_limit->val_uint() : 0;
+ offset_limit_cnt= (ha_rows)(sl->offset_limit ?
+ sl->offset_limit->val_uint() :
+ 0);
if (!res)
{
examined_rows+= thd->examined_row_count;
--- 1.41/sql/examples/ha_archive.cc 2005-06-06 20:21:28 +02:00
+++ 1.42/sql/examples/ha_archive.cc 2005-06-18 01:52:39 +02:00
@@ -259,7 +259,7 @@
This method reads the header of a meta file and returns whether or not it was successful.
*rows will contain the current number of rows in the data file upon success.
*/
-int ha_archive::read_meta_file(File meta_file, ulonglong *rows)
+int ha_archive::read_meta_file(File meta_file, ha_rows *rows)
{
uchar meta_buffer[META_BUFFER_SIZE];
ulonglong check_point;
@@ -273,7 +273,7 @@
/*
Parse out the meta data, we ignore version at the moment
*/
- *rows= uint8korr(meta_buffer + 2);
+ *rows= (ha_rows)uint8korr(meta_buffer + 2);
check_point= uint8korr(meta_buffer + 10);
DBUG_PRINT("ha_archive::read_meta_file", ("Check %d", (uint)meta_buffer[0]));
@@ -296,7 +296,7 @@
By setting dirty you say whether or not the file represents the actual state of the data file.
Upon ::open() we set to dirty, and upon ::close() we set to clean.
*/
-int ha_archive::write_meta_file(File meta_file, ulonglong rows, bool dirty)
+int ha_archive::write_meta_file(File meta_file, ha_rows rows, bool dirty)
{
uchar meta_buffer[META_BUFFER_SIZE];
ulonglong check_point= 0; //Reserved for the future
@@ -787,7 +787,7 @@
DBUG_ENTER("ha_archive::rnd_pos");
statistic_increment(table->in_use->status_var.ha_read_rnd_next_count,
&LOCK_status);
- current_position= my_get_ptr(pos, ref_length);
+ current_position= (z_off_t)my_get_ptr(pos, ref_length);
(void)gzseek(archive, current_position, SEEK_SET);
DBUG_RETURN(get_row(archive, buf));
@@ -801,7 +801,7 @@
{
int rc;
byte *buf;
- ulonglong rows_recorded= 0;
+ ha_rows rows_recorded= 0;
gzFile rebuild_file; // Archive file we are working with
File meta_file; // Meta file we use
char data_file_name[FN_REFLEN];
--- 1.20/sql/examples/ha_archive.h 2005-05-23 22:30:54 +02:00
+++ 1.21/sql/examples/ha_archive.h 2005-06-18 01:53:12 +02:00
@@ -36,7 +36,7 @@
gzFile archive_write; /* Archive file we are working with */
bool dirty; /* Flag for if a flush should occur */
bool crashed; /* Meta file is crashed */
- ulonglong rows_recorded; /* Number of rows in tables */
+ ha_rows rows_recorded; /* Number of rows in tables */
} ARCHIVE_SHARE;
/*
@@ -88,8 +88,8 @@
int rnd_next(byte *buf);
int rnd_pos(byte * buf, byte *pos);
int get_row(gzFile file_to_read, byte *buf);
- int read_meta_file(File meta_file, ulonglong *rows);
- int write_meta_file(File meta_file, ulonglong rows, bool dirty);
+ int read_meta_file(File meta_file, ha_rows *rows);
+ int write_meta_file(File meta_file, ha_rows rows, bool dirty);
ARCHIVE_SHARE *get_share(const char *table_name, TABLE *table);
int free_share(ARCHIVE_SHARE *share);
bool auto_repair() const { return 1; } // For the moment we just do this
--- 1.34/VC++Files/sql/mysqld.dsp 2005-06-10 04:08:06 +02:00
+++ 1.35/VC++Files/sql/mysqld.dsp 2005-06-18 01:52:18 +02:00
@@ -84,7 +84,7 @@
# ADD BSC32 /nologo
LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_debug\dbug.lib ..\lib_debug\vio.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib ..\lib_debug\bdb.lib ..\lib_debug\innodb.lib ..\extra\yassl\Release\yassl.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../client_debug/mysqld-debug.exe" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_debug\dbug.lib ..\lib_debug\vio.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib ..\lib_debug\bdb.lib ..\lib_debug\innodb.lib ..\extra\yassl\Debug\yassl.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../client_debug/mysqld-debug.exe" /pdbtype:sept
!ELSEIF "$(CFG)" == "mysqld - Win32 nt"
--- 1.28/sql/ha_federated.cc 2005-06-05 16:18:48 +02:00
+++ 1.29/sql/ha_federated.cc 2005-06-18 01:53:25 +02:00
@@ -842,7 +842,7 @@
query.length(0);
uint table_name_length, table_base_name_length;
- char *tmp_table_name, *tmp_table_base_name, *table_base_name, *select_query;
+ char *tmp_table_name, *table_base_name, *select_query;
/* share->table_name has the file location - we want the table's name! */
table_base_name= (char*) table->s->table_name;
@@ -963,7 +963,6 @@
int ha_federated::open(const char *name, int mode, uint test_if_locked)
{
- int rc;
DBUG_ENTER("ha_federated::open");
if (!(share= get_share(name, table)))
@@ -1076,7 +1075,7 @@
{
uint x= 0, num_fields= 0;
Field **field;
- ulong current_query_id= 1;
+ query_id_it current_query_id= 1;
ulong tmp_query_id= 1;
uint all_fields_have_same_query_id= 1;
@@ -1471,8 +1470,6 @@
__attribute__ ((unused)))
{
char index_value[IO_SIZE];
- char key_value[IO_SIZE];
- char test_value[IO_SIZE];
String index_string(index_value, sizeof(index_value), &my_charset_bin);
index_string.length(0);
uint keylen;
@@ -1538,7 +1535,6 @@
/* Initialized at each key walk (called multiple times unlike rnd_init()) */
int ha_federated::index_init(uint keynr)
{
- int error;
DBUG_ENTER("ha_federated::index_init");
DBUG_PRINT("info",
("table: '%s' key: %d", table->s->table_name, keynr));
@@ -1570,7 +1566,6 @@
int ha_federated::rnd_init(bool scan)
{
DBUG_ENTER("ha_federated::rnd_init");
- int num_fields, rows;
/*
This 'scan' flag is incredibly important for this handler to work
| Thread |
|---|
| • bk commit into 5.0 tree (jimw:1.1954) BUG#11045 | Jim Winstead | 18 Jun |
