Below is the list of changes that have just been committed into a local
5.1 repository of mysqldev. When mysqldev 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.1984 05/11/29 09:07:21 knielsen@stripped +3 -0
Fix byte * vs. char * mismatches that break Win32 compilation.
sql/table.cc
1.190 05/11/29 09:06:11 knielsen@stripped +2 -2
Fix byte * vs. char * mismatches that break Win32 compilation.
sql/sql_base.cc
1.282 05/11/29 09:06:11 knielsen@stripped +7 -7
Fix byte * vs. char * mismatches that break Win32 compilation.
sql/mysql_priv.h
1.347 05/11/29 09:06:10 knielsen@stripped +3 -3
Fix byte * vs. char * mismatches that break Win32 compilation.
# 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: knielsen
# Host: production.mysql.com
# Root: /data0/mysqldev/my/mysql-5.1.3-fixes
--- 1.346/sql/mysql_priv.h 2005-11-24 03:08:02 +01:00
+++ 1.347/sql/mysql_priv.h 2005-11-29 09:06:10 +01:00
@@ -784,9 +784,9 @@
bool reset_auto_increment);
bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok);
bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create);
-uint create_table_def_key(THD *thd, byte *key, TABLE_LIST *table_list,
+uint create_table_def_key(THD *thd, char *key, TABLE_LIST *table_list,
bool tmp_table);
-TABLE_SHARE *get_table_share(THD *thd, TABLE_LIST *table_list, byte *key,
+TABLE_SHARE *get_table_share(THD *thd, TABLE_LIST *table_list, char *key,
uint key_length, uint db_flags, int *error);
void release_table_share(TABLE_SHARE *share, enum release_type type);
TABLE_SHARE *get_cached_table_share(const char *db, const char *table_name);
@@ -1396,7 +1396,7 @@
my_string *errpos);
/* table.cc */
-TABLE_SHARE *alloc_table_share(TABLE_LIST *table_list, byte *key,
+TABLE_SHARE *alloc_table_share(TABLE_LIST *table_list, char *key,
uint key_length);
void init_tmp_table_share(TABLE_SHARE *share, const char *key, uint key_length,
const char *table_name, const char *path);
--- 1.281/sql/sql_base.cc 2005-11-24 03:08:02 +01:00
+++ 1.282/sql/sql_base.cc 2005-11-29 09:06:11 +01:00
@@ -38,7 +38,7 @@
static int open_unireg_entry(THD *thd, TABLE *entry, TABLE_LIST *table_list,
const char *alias,
- byte *cache_key, uint cache_key_length,
+ char *cache_key, uint cache_key_length,
MEM_ROOT *mem_root);
static void free_cache_entry(TABLE *entry);
static void mysql_rm_tmp_tables(void);
@@ -171,7 +171,7 @@
Length of key
*/
-uint create_table_def_key(THD *thd, byte *key, TABLE_LIST *table_list,
+uint create_table_def_key(THD *thd, char *key, TABLE_LIST *table_list,
bool tmp_table)
{
uint key_length= (uint) (strmov(strmov(key, table_list->db)+1,
@@ -273,7 +273,7 @@
# Share for table
*/
-TABLE_SHARE *get_table_share(THD *thd, TABLE_LIST *table_list, byte *key,
+TABLE_SHARE *get_table_share(THD *thd, TABLE_LIST *table_list, char *key,
uint key_length, uint db_flags, int *error)
{
TABLE_SHARE *share;
@@ -339,7 +339,7 @@
(void) pthread_mutex_lock(&share->mutex);
#endif
*error= share->error;
- (void) hash_delete(&table_def_cache, (char*) share);
+ (void) hash_delete(&table_def_cache, (byte*) share);
DBUG_RETURN(0);
}
share->ref_count++; // Mark in use
@@ -411,7 +411,7 @@
static TABLE_SHARE
*get_table_share_with_create(THD *thd, TABLE_LIST *table_list,
- byte *key, uint key_length,
+ char *key, uint key_length,
uint db_flags, int *error)
{
TABLE_SHARE *share;
@@ -586,7 +586,7 @@
TABLE_SHARE *get_cached_table_share(const char *db, const char *table_name)
{
- byte key[NAME_LEN*2+2];
+ char key[NAME_LEN*2+2];
TABLE_LIST table_list;
uint key_length;
safe_mutex_assert_owner(&LOCK_open);
@@ -2366,7 +2366,7 @@
static int open_unireg_entry(THD *thd, TABLE *entry, TABLE_LIST *table_list,
const char *alias,
- byte *cache_key, uint cache_key_length,
+ char *cache_key, uint cache_key_length,
MEM_ROOT *mem_root)
{
int error;
--- 1.189/sql/table.cc 2005-11-25 10:33:07 +01:00
+++ 1.190/sql/table.cc 2005-11-29 09:06:11 +01:00
@@ -57,7 +57,7 @@
# Share
*/
-TABLE_SHARE *alloc_table_share(TABLE_LIST *table_list, byte *key,
+TABLE_SHARE *alloc_table_share(TABLE_LIST *table_list, char *key,
uint key_length)
{
MEM_ROOT mem_root;
@@ -1268,7 +1268,7 @@
outparam->field= field_ptr;
- record= (char*) outparam->record[0]-1; /* Fieldstart = 1 */
+ record= (byte*) outparam->record[0]-1; /* Fieldstart = 1 */
if (share->null_field_first)
outparam->null_flags= (uchar*) record+1;
else
| Thread |
|---|
| • bk commit into 5.1 tree (knielsen:1.1984) | knielsen | 29 Nov |
