Commit 9b4306b8 authored by anozdrin/alik@quad.'s avatar anozdrin/alik@quad.
Browse files

Merge quad.:/mnt/raid/alik/MySQL/devel/5.0-rt 

into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
parents 917c7952 1bf737a1

client/mysqlcheck.c

+12 −7
Original line number Diff line number Diff line
@@ -512,14 +512,17 @@ static int process_all_tables_in_db(char *database) 
{

  MYSQL_RES *res;

  MYSQL_ROW row;

  uint num_columns;



  LINT_INIT(res);

  if (use_db(database))

    return 1;

  if (mysql_query(sock, "SHOW TABLE STATUS") ||

  if (mysql_query(sock, "SHOW /*!50002 FULL*/ TABLES") ||

	!((res= mysql_store_result(sock))))

    return 1;



  num_columns= mysql_num_fields(res);



  if (opt_all_in_1)

  {

    /*
@@ -542,13 +545,12 @@ static int process_all_tables_in_db(char *database) 
    }

    for (end = tables + 1; (row = mysql_fetch_row(res)) ;)

    {

      /* Skip tables with an engine of NULL (probably a view). */

      if (row[1])

      {

      if ((num_columns == 2) && (strcmp(row[1], "VIEW") == 0))

        continue;



      end= fix_table_name(end, row[0]);

      *end++= ',';

    }

    }

    *--end = 0;

    if (tot_length)

      handle_request_for_tables(tables + 1, tot_length - 1);
@@ -563,6 +565,9 @@ static int process_all_tables_in_db(char *database) 
      */

      if (row[1] || what_to_do == DO_UPGRADE)

      {

        if ((num_columns == 2) && (strcmp(row[1], "VIEW") == 0))

          continue;

        

        handle_request_for_tables(row[0], fixed_name_length(row[0]));

      }

  }

configure.in

+2 −0
Original line number Diff line number Diff line
@@ -799,6 +799,8 @@ AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open)) 
AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))

# Check if crypt() exists in libc or libcrypt, sets LIBS if needed

AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))

# See if we need a library for address lookup.

AC_SEARCH_LIBS(inet_aton, [socket nsl resolv])



# For the sched_yield() function on Solaris

AC_CHECK_FUNC(sched_yield, , AC_CHECK_LIB(posix4, sched_yield))

extra/resolveip.c

+4 −2
Original line number Diff line number Diff line
@@ -116,11 +116,13 @@ int main(int argc, char **argv) 


  while (argc--)

  {

    struct in_addr addr;

    ip = *argv++;    



    if (my_isdigit(&my_charset_latin1,ip[0]))

    /* Not compatible with IPv6!  Probably should use getnameinfo(). */

    if (inet_aton(ip, &addr) != 0)

    {

      taddr = inet_addr(ip);

      taddr= addr.s_addr;

      if (taddr == htonl(INADDR_BROADCAST))

      {	

	puts("Broadcast");

mysql-test/r/mysqlcheck.result

+11 −0
Original line number Diff line number Diff line
@@ -62,6 +62,17 @@ create table `t 1`(a int); 
test.t 1                                           OK

test.t`1                                           OK

drop table `t``1`, `t 1`;

create database d_bug25347;

use d_bug25347;

create table t_bug25347 (a int);

create view v_bug25347 as select * from t_bug25347;

flush tables;

removing and creating

d_bug25347.t_bug25347                              OK

drop view v_bug25347;

drop table t_bug25347;

drop database d_bug25347;

use test;

End of 5.0 tests

create table t1(a int);

create view v1 as select * from t1;

mysql-test/r/variables.result

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ select * from information_schema.global_variables where variable_name like 'myis 
VARIABLE_NAME	VARIABLE_VALUE

MYISAM_MAX_SORT_FILE_SIZE	1048576

set GLOBAL myisam_max_sort_file_size=default;

show variables like 'myisam_max_sort_file_size';

show global variables like 'myisam_max_sort_file_size';

Variable_name	Value

myisam_max_sort_file_size	FILE_SIZE

select * from information_schema.session_variables where variable_name like 'myisam_max_sort_file_size';