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

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

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


myisam/mi_key.c:
  Auto merged
sql/handler.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
parents a082303f 0e1e0ddf

client/mysqladmin.cc

+1 −1
Original line number Diff line number Diff line
@@ -727,7 +727,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) 
      void (*func) (MYSQL_RES*, MYSQL_ROW, uint);



      new_line = 1;

      if (mysql_query(mysql, "show status") ||

      if (mysql_query(mysql, "show /*!50002 GLOBAL */ status") ||

	  !(res = mysql_store_result(mysql)))

      {

	my_printf_error(0, "unable to show status; error: '%s'", MYF(ME_BELL),

sql/handler.cc

+4 −3
Original line number Diff line number Diff line
@@ -185,9 +185,10 @@ enum db_type ha_checktype(enum db_type database_type) 
  thd= current_thd;

  return ((enum db_type) thd->variables.table_type != DB_TYPE_UNKNOWN ?

          (enum db_type) thd->variables.table_type :

          (enum db_type) global_system_variables.table_type !=

          ((enum db_type) global_system_variables.table_type !=

           DB_TYPE_UNKNOWN ?

          (enum db_type) global_system_variables.table_type : DB_TYPE_MYISAM);

           (enum db_type) global_system_variables.table_type : DB_TYPE_MYISAM)

          );

} /* ha_checktype */

tests/mysql_client_test.c

+4 −3
Original line number Diff line number Diff line
@@ -7046,6 +7046,7 @@ static void test_set_option() 
  bug #89 (reported by mark@mysql.com)

*/



#ifndef EMBEDDED_LIBRARY

static void test_prepare_grant()

{

  int rc;
@@ -7138,7 +7139,7 @@ static void test_prepare_grant() 


  }

}



#endif



/*

  Test a crash when invalid/corrupted .frm is used in the
@@ -12597,7 +12598,7 @@ static void test_bug8330() 
  const char *stmt_text;

  MYSQL_STMT *stmt[2];

  int i, rc;

  char *query= "select a,b from t1 where a=?";

  const char *query= "select a,b from t1 where a=?";

  MYSQL_BIND bind[2];

  long lval[2];
@@ -12788,7 +12789,7 @@ static void test_bug8722() 
}





MYSQL_STMT *open_cursor(char *query)

MYSQL_STMT *open_cursor(const char *query)

{

  int rc;

  const ulong type= (ulong)CURSOR_TYPE_READ_ONLY;