Commit 1535da65 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0-runtime 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/collapsed:
  auto-union
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
parents 2e219863 7d748765

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1051,6 +1051,7 @@ ndbcluster-1186/ndb_3.pid 
ndbcluster-1186/ndb_3_cluster.log

ndbcluster-1186/ndb_3_out.log

ndbcluster-1186/ndbcluster.pid

netware/libmysql.imp

pack_isam/*.ds?

perror/*.ds?

perror/*.vcproj

BitKeeper/etc/collapsed

+2 −0
Original line number Diff line number Diff line
@@ -5,3 +5,5 @@ 
45001f7c3b2hhCXDKfUvzkX9TNe6VA

45002051rHJfMEXAIMiAZV0clxvKSA

4513d8e4Af4dQWuk13sArwofRgFDQw

4519a6c5BVUxEHTf5iJnjZkixMBs8g

451ab499rgdjXyOnUDqHu-wBDoS-OQ

CMakeLists.txt

+4 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ IF (WITH_MYISAMMRG_STORAGE_ENGINE) 
ENDIF (WITH_MYISAMMRG_STORAGE_ENGINE)



IF(WITH_INNOBASE_STORAGE_ENGINE)

  CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/innobase/ib_config.h.in

               ${CMAKE_SOURCE_DIR}/innobase/ib_config.h @ONLY)

  ADD_DEFINITIONS(-D HAVE_INNOBASE_DB)

  ADD_DEFINITIONS(-D WITH_INNOBASE_STORAGE_ENGINE)

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_innobase_plugin")
@@ -123,8 +121,12 @@ ADD_SUBDIRECTORY(heap) 
ADD_SUBDIRECTORY(myisam)

ADD_SUBDIRECTORY(myisammrg)

ADD_SUBDIRECTORY(client)

IF(WITH_BERKELEY_STORAGE_ENGINE)

ADD_SUBDIRECTORY(bdb)

ENDIF(WITH_BERKELEY_STORAGE_ENGINE)

IF(WITH_INNOBASE_STORAGE_ENGINE)

ADD_SUBDIRECTORY(innobase)

ENDIF(WITH_INNOBASE_STORAGE_ENGINE)

ADD_SUBDIRECTORY(sql)

ADD_SUBDIRECTORY(sql/examples)

ADD_SUBDIRECTORY(server-tools/instance-manager)

client/mysql.cc

+54 −15
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ const char *VER= "14.12"; 
/* Don't try to make a nice table if the data is too big */

#define MAX_COLUMN_LENGTH	     1024



/* Buffer to hold 'version' and 'version_comment' */

#define MAX_SERVER_VERSION_LENGTH     128



gptr sql_alloc(unsigned size);	     // Don't use mysqld alloc for these

void sql_element_free(void *ptr);

#include "sql_string.h"
@@ -208,6 +211,7 @@ static int com_nopager(String *str, char*), com_pager(String *str, char*), 
static int read_and_execute(bool interactive);

static int sql_connect(char *host,char *database,char *user,char *password,

		       uint silent);

static const char *server_version_string(MYSQL *mysql);

static int put_info(const char *str,INFO_TYPE info,uint error=0,

		    const char *sql_state=0);

static int put_error(MYSQL *mysql);
@@ -432,8 +436,8 @@ int main(int argc,char *argv[]) 
  put_info("Welcome to the MySQL monitor.  Commands end with ; or \\g.",

	   INFO_INFO);

  sprintf((char*) glob_buffer.ptr(),

	  "Your MySQL connection id is %lu to server version: %s\n",

	  mysql_thread_id(&mysql),mysql_get_server_info(&mysql));

	  "Your MySQL connection id is %lu\nServer version: %s\n",

	  mysql_thread_id(&mysql), server_version_string(&mysql));

  put_info((char*) glob_buffer.ptr(),INFO_INFO);



#ifdef HAVE_READLINE
@@ -2509,10 +2513,15 @@ print_table_data_xml(MYSQL_RES *result) 
    {

      tee_fprintf(PAGER, "\t<field name=\"");

      xmlencode_print(fields[i].name, (uint) strlen(fields[i].name));

      if (cur[i])

      {

        tee_fprintf(PAGER, "\">");

        xmlencode_print(cur[i], lengths[i]);

        tee_fprintf(PAGER, "</field>\n");

      }

      else

        tee_fprintf(PAGER, "\" xsi:nil=\"true\" />\n");

    }

    (void) tee_fputs("  </row>\n", PAGER);

  }

  (void) tee_fputs("</resultset>\n", PAGER);
@@ -2910,7 +2919,7 @@ com_connect(String *buffer, char *line) 
  bzero(buff, sizeof(buff));

  if (buffer)

  {

    strmake(buff, line, sizeof(buff));

    strmake(buff, line, sizeof(buff) - 1);

    tmp= get_arg(buff, 0);

    if (tmp && *tmp)

    {
@@ -3025,7 +3034,7 @@ com_use(String *buffer __attribute__((unused)), char *line) 
  int select_db;



  bzero(buff, sizeof(buff));

  strmov(buff, line);

  strmake(buff, line, sizeof(buff) - 1);

  tmp= get_arg(buff, 0);

  if (!tmp || !*tmp)

  {
@@ -3335,16 +3344,13 @@ com_status(String *buffer __attribute__((unused)), 
  tee_fprintf(stdout, "Using outfile:\t\t'%s'\n", opt_outfile ? outfile : "");

#endif

  tee_fprintf(stdout, "Using delimiter:\t%s\n", delimiter);

  tee_fprintf(stdout, "Server version:\t\t%s\n", mysql_get_server_info(&mysql));

  tee_fprintf(stdout, "Server version:\t\t%s\n", server_version_string(&mysql));

  tee_fprintf(stdout, "Protocol version:\t%d\n", mysql_get_proto_info(&mysql));

  tee_fprintf(stdout, "Connection:\t\t%s\n", mysql_get_host_info(&mysql));

  if ((id= mysql_insert_id(&mysql)))

    tee_fprintf(stdout, "Insert id:\t\t%s\n", llstr(id, buff));



  /* 

    Don't remove "limit 1", 

    it is protection againts SQL_SELECT_LIMIT=0

  */

  /* "limit 1" is protection against SQL_SELECT_LIMIT=0 */

  if (!mysql_query(&mysql,"select @@character_set_client, @@character_set_connection, @@character_set_server, @@character_set_database limit 1") &&

      (result=mysql_use_result(&mysql)))

  {
@@ -3409,6 +3415,39 @@ select_limit, max_join_size); 
  return 0;

}



static const char *

server_version_string(MYSQL *mysql)

{

  static char buf[MAX_SERVER_VERSION_LENGTH] = "";



  /* Only one thread calls this, so no synchronization is needed */

  if (buf[0] == '\0')

  {

    char *bufp = buf;

    MYSQL_RES *result;

    MYSQL_ROW cur;



    bufp = strnmov(buf, mysql_get_server_info(mysql), sizeof buf);



    /* "limit 1" is protection against SQL_SELECT_LIMIT=0 */

    if (!mysql_query(mysql, "select @@version_comment limit 1") &&

        (result = mysql_use_result(mysql)))

    {

      MYSQL_ROW cur = mysql_fetch_row(result);

      if (cur && cur[0])

      {

        bufp = strxnmov(bufp, sizeof buf - (bufp - buf), " ", cur[0], NullS);

      }

      mysql_free_result(result);

    }



    /* str*nmov doesn't guarantee NUL-termination */

    if (bufp == buf + sizeof buf)

      buf[sizeof buf - 1] = '\0';

  }



  return buf;

}



static int

put_info(const char *str,INFO_TYPE info_type, uint error, const char *sqlstate)
@@ -3536,14 +3575,14 @@ void tee_puts(const char *s, FILE *file) 
{

  NETWARE_YIELD;

  fputs(s, file);

  fputs("\n", file);

  fputc('\n', file);

#ifdef OS2

  fflush(file);

#endif

  if (opt_outfile)

  {

    fputs(s, OUTFILE);

    fputs("\n", OUTFILE);

    fputc('\n', OUTFILE);

  }

}

client/mysqltest.c

+13 −3
Original line number Diff line number Diff line
@@ -1608,8 +1608,12 @@ int do_save_master_pos() 


int do_let(struct st_query *query)

{

  int ret;

  char *p= query->first_argument;

  char *var_name, *var_name_end, *var_val_start;

  char *var_name, *var_name_end;

  DYNAMIC_STRING let_rhs_expr;



  init_dynamic_string(&let_rhs_expr, "", 512, 2048);



  /* Find <var_name> */

  if (!*p)
@@ -1628,10 +1632,16 @@ int do_let(struct st_query *query) 
  /* Find start of <var_val> */

  while (*p && my_isspace(charset_info,*p))

    p++;

  var_val_start= p;



  do_eval(&let_rhs_expr, p, FALSE);



  query->last_argument= query->end;

  /* Assign var_val to var_name */

  return var_set(var_name, var_name_end, var_val_start, query->end);

  ret= var_set(var_name, var_name_end, let_rhs_expr.str, 

                 (let_rhs_expr.str + let_rhs_expr.length));

  dynstr_free(&let_rhs_expr);



  return(ret);

}