Commit affe9f8c authored by unknown's avatar unknown
Browse files

merge 


mysql-test/mysql-test-run.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_bitmap.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_test1.c:
  Auto merged
parents 81a13dd1 f21e2364

VC++Files/libmysql/libmysql.dsp

+0 −4
Original line number Diff line number Diff line
@@ -147,10 +147,6 @@ SOURCE="..\strings\ctype-czech.c" 
# End Source File

# Begin Source File



SOURCE="..\strings\ctype-cp932.c"

# End Source File

# Begin Source File



SOURCE="..\strings\ctype-euc_kr.c"

# End Source File

# Begin Source File

client/mysql.cc

+16 −15
Original line number Diff line number Diff line
@@ -1657,9 +1657,10 @@ int mysql_real_query_for_lazy(const char *buf, int length) 
{

  for (uint retry=0;; retry++)

  {

    int error;

    if (!mysql_real_query(&mysql,buf,length))

      return 0;

    int error= put_error(&mysql);

    error= put_error(&mysql);

    if (mysql_errno(&mysql) != CR_SERVER_GONE_ERROR || retry > 1 ||

        !opt_reconnect)

      return error;
@@ -2314,22 +2315,23 @@ print_table_data_vertically(MYSQL_RES *result) 
  }

}





/* print_warnings should be called right after executing a statement */

static void

print_warnings()



static void print_warnings()

{

  char query[30];

  const char   *query;

  MYSQL_RES    *result;

  MYSQL_ROW    cur;

  my_ulonglong num_rows;



  /* Get the warnings */

  strmov(query,"show warnings");

  query= "show warnings";

  mysql_real_query_for_lazy(query, strlen(query));

  mysql_store_result_for_lazy(&result);



  /* Bail out when no warnings */

  my_ulonglong num_rows = mysql_num_rows(result);

  if (num_rows == 0) 

  if (!(num_rows= mysql_num_rows(result)))

  {

    mysql_free_result(result);

    return;
@@ -2343,13 +2345,12 @@ print_warnings() 
  mysql_free_result(result);

}



static const char

*array_value(const char **array, char key)



static const char *array_value(const char **array, char key)

{

  int x;

  for (x= 0; array[x]; x+= 2)

    if (*array[x] == key)

      return array[x + 1];

  for (; *array; array+= 2)

    if (**array == key)

      return array[1];

  return 0;

}

client/mysqltest.c

+6 −5
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ typedef struct 


static char *subst_env_var(const char *cmd);

static FILE *my_popen(const char *cmd, const char *mode);

#undef popen

#define popen(A,B) my_popen((A),(B))

#endif /* __NETWARE__ */
@@ -2587,13 +2588,13 @@ static void append_result(DYNAMIC_STRING *ds, MYSQL_RES *res) 
      {

	if (i)

	  dynstr_append_mem(ds, "\t", 1);

	replace_dynstr_append_mem(ds, val, len);

	replace_dynstr_append_mem(ds, val, (int)len);

      }

      else

      {

	dynstr_append(ds, fields[i].name);

	dynstr_append_mem(ds, "\t", 1);

	replace_dynstr_append_mem(ds, val, len);

	replace_dynstr_append_mem(ds, val, (int)len);

	dynstr_append_mem(ds, "\n", 1);

      }

    }
@@ -2960,7 +2961,7 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags) 
  int error= 0;             /* Function return code if "goto end;" */

  int err;                  /* Temporary storage of return code from calls */

  int query_len, got_error_on_execute;

  uint num_rows;

  ulonglong num_rows;

  char *query;

  MYSQL_RES *res= NULL;     /* Note that here 'res' is meta data result set */

  DYNAMIC_STRING *ds;
@@ -3215,13 +3216,13 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags) 
          {

            if (col_idx)                      /* No tab before first col */

              dynstr_append_mem(ds, "\t", 1);

            replace_dynstr_append_mem(ds, val, len);

            replace_dynstr_append_mem(ds, val, (int)len);

          }

          else

          {

            dynstr_append(ds, field[col_idx].name);

            dynstr_append_mem(ds, "\t", 1);

            replace_dynstr_append_mem(ds, val, len);

            replace_dynstr_append_mem(ds, val, (int)len);

            dynstr_append_mem(ds, "\n", 1);

          }

        }

client/sql_string.h

+0 −2
Original line number Diff line number Diff line
@@ -260,8 +260,6 @@ class String 
  }

  bool fill(uint32 max_length,char fill);

  void strip_sp();

  inline void caseup() { my_caseup(str_charset,Ptr,str_length); }

  inline void casedn() { my_casedn(str_charset,Ptr,str_length); }

  friend int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);

  friend int stringcmp(const String *a,const String *b);

  friend String *copy_if_not_alloced(String *a,String *b,uint32 arg_length);

extra/yassl/mySTL/memory.hpp

+4 −2
Original line number Diff line number Diff line
@@ -37,16 +37,18 @@ 
namespace mySTL {





template<typename T, typename Deletor = void (*) (T*)>

template<typename T>

struct auto_ptr_ref {

    typedef void (*Deletor)(T*);

    T*      ptr_;

    Deletor del_;

    auto_ptr_ref(T* p, Deletor d) : ptr_(p), del_(d) {}

};





template<typename T, typename Deletor = void (*) (T*)>

template<typename T>

class auto_ptr {

    typedef void (*Deletor)(T*);

    T*       ptr_;

    Deletor  del_;