Commit 8a23dd86 authored by unknown's avatar unknown
Browse files

Merge jwinstead@production.mysql.com:my/mysql-5.0-11045 

into  mysql.com:/home/jimw/my/mysql-5.0-clean


VC++Files/sql/mysqld.dsp:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/item_strfunc.cc:
  SCCS merged
parents 348dfd41 2e70ec89

VC++Files/sql/mysqld.dsp

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ BSC32=bscmake.exe 
# 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"

VC++Files/tests/mysql_client_test.dsp

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ BSC32=bscmake.exe 
# ADD BASE BSC32 /nologo 

# ADD BSC32 /nologo 

LINK32=link.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 odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib /nologo /out:"..\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console 

# 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 odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib /nologo /out:"..\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console 

# 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 odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib ..\extra\yassl\Debug\yassl.lib /nologo /out:"..\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console 

# 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 odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib ..\extra\yassl\Debug\yassl.lib /nologo /out:"..\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console 



!ELSEIF  "$(CFG)" == "mysql_client_test - Win32 Release"

sql/examples/ha_archive.cc

+5 −5
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ int ha_archive::write_data_header(gzFile file_to_write) 
  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 @@ int ha_archive::read_meta_file(File meta_file, ulonglong *rows) 
  /*

    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 @@ int ha_archive::read_meta_file(File meta_file, ulonglong *rows) 
  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 @@ int ha_archive::rnd_pos(byte * buf, byte *pos) 
  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 ha_archive::repair(THD* thd, HA_CHECK_OPT* check_opt) 
{

  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];

sql/examples/ha_archive.h

+3 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ typedef struct st_archive_share { 
  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 @@ class ha_archive: public handler 
  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

sql/ha_federated.cc

+2 −7
Original line number Diff line number Diff line
@@ -848,7 +848,7 @@ static FEDERATED_SHARE *get_share(const char *table_name, TABLE *table) 
  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;
@@ -969,7 +969,6 @@ const char **ha_federated::bas_ext() const 


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)))
@@ -1088,7 +1087,7 @@ int ha_federated::write_row(byte *buf) 
{

  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;
@@ -1479,8 +1478,6 @@ int ha_federated::index_read_idx(byte *buf, uint index, const byte *key, 
                                 __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;
@@ -1546,7 +1543,6 @@ int ha_federated::index_read_idx(byte *buf, uint index, const byte *key, 
/* 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));
@@ -1578,7 +1574,6 @@ int ha_federated::index_next(byte *buf) 
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