Commit ffc492cd authored by unknown's avatar unknown
Browse files

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

into mysql.com:/my/mysql-4.1
parents 616d5a6f c2a2f5af

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -1004,3 +1004,6 @@ vio/test-sslserver 
vio/viotest-ssl

tests/mysql_client_test

tests/mysql_client_test

libmysqld/examples/mysql_client_test.c

libmysqld/examples/mysql_client_test_embedded

libmysqld/examples/mysqltest_embedded

client/mysqlbinlog.cc

+13 −4
Original line number Diff line number Diff line
@@ -695,8 +695,12 @@ static MYSQL* safe_connect() 
  if (opt_protocol)

    mysql_options(local_mysql, MYSQL_OPT_PROTOCOL, (char*) &opt_protocol);

  if (!mysql_real_connect(local_mysql, host, user, pass, 0, port, sock, 0))

    die("failed on connect: %s", mysql_error(local_mysql));



  {

    char errmsg[256];

    strmake(errmsg, mysql_error(local_mysql), sizeof(errmsg)-1);

    mysql_close(local_mysql);

    die("failed on connect: %s", errmsg);

  }

  return local_mysql;

}
@@ -717,7 +721,12 @@ static int check_master_version(MYSQL* mysql) 


  if (mysql_query(mysql, "SELECT VERSION()") ||

      !(res = mysql_store_result(mysql)))

    die("Error checking master version: %s", mysql_error(mysql));

  {

    char errmsg[256];

    strmake(errmsg, mysql_error(mysql), sizeof(errmsg)-1);

    mysql_close(mysql);

    die("Error checking master version: %s", errmsg);

  }

  if (!(row = mysql_fetch_row(res)))

  {

    mysql_free_result(res);

innobase/include/eval0eval.ic

+0 −2
Original line number Diff line number Diff line
@@ -205,8 +205,6 @@ eval_node_copy_and_alloc_val( 
{

	byte*		data;

	

	ut_ad(UNIV_SQL_NULL > ULINT_MAX);



	if (len == UNIV_SQL_NULL) {

		dfield_set_len(que_node_get_val(node), len);

sql/mysqld.cc

+4 −5
Original line number Diff line number Diff line
@@ -2915,12 +2915,11 @@ You should consider changing lower_case_table_names to 1 or 2", 
             (test_if_case_insensitive(mysql_real_data_home) == 1)))

  {

    if (global_system_variables.log_warnings)

      sql_print_warning("\

You have forced lower_case_table_names to 2 through a command-line \

option, even though your file system '%s' is case sensitive.  This means \

that you can create a table that you can then no longer access. \

You should consider changing lower_case_table_names to 0.",

      sql_print_warning("lower_case_table_names was set to 2, even though your "

                        "the file system '%s' is case sensitive.  Now setting "

                        "lower_case_table_names to 0 to avoid future problems.",

			mysql_real_data_home);

    lower_case_table_names= 0;

  }



  select_thread=pthread_self();

sql/sql_select.cc

+0 −7
Original line number Diff line number Diff line
@@ -2828,16 +2828,9 @@ find_best(JOIN *join,table_map rest_tables,uint idx,double record_count, 
		    x = used key parts (1 <= x <= c)

		  */

		  double rec_per_key;

#if 0

		  if (!(rec_per_key=(double)

			keyinfo->rec_per_key[keyinfo->key_parts-1]))

		    rec_per_key=(double) s->records/rec+1;

#else

                  rec_per_key= keyinfo->rec_per_key[keyinfo->key_parts-1] ?

		    (double) keyinfo->rec_per_key[keyinfo->key_parts-1] :

		    (double) s->records/rec+1;   

#endif



		  if (!s->records)

		    tmp=0;

		  else if (rec_per_key/(double) s->records >= 0.01)