Commit 29510745 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fixed bug with SELECT * ... UNION

parent 2e63f787

client/mysql.cc

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include <signal.h>

#include <violite.h>



const char *VER="11.15";

const char *VER="11.16";



/* Don't try to make a nice table if the data is too big */

#define MAX_COLUMN_LENGTH	     1024

client/mysqltest.c

+1 −1
Original line number Diff line number Diff line
@@ -1934,7 +1934,7 @@ static void init_var_hash() 
static const char *embedded_server_args[] = {

  "",	/* XXX: argv[0] is program name - we should fix the API */

  "--datadir=.",

  "--language=/home/tim/my/4/sql/share/english",

  "--language=/usr/local/mysql/share/mysql/english",

  "--skip-innodb",

  NullS

};

include/mysql.h

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ typedef struct st_mysql_res { 
/* Set up and bring down the server; to ensure that applications will

 * work when linked against either the standard client library or the

 * embedded server library, these functions should be called. */

void mysql_server_init(int argc, char **argv, const char **groups);

void mysql_server_init(int argc, const char **argv, const char **groups);

void mysql_server_end();



/* Set up and bring down a thread; these function should be called

libmysql/libmysql.c

+5 −3
Original line number Diff line number Diff line
@@ -92,10 +92,12 @@ static ulong mysql_sub_escape_string(CHARSET_INFO *charset_info, char *to, 
				     const char *from, ulong length);



void mysql_server_init(int argc __attribute__((unused)),

                      char **argv __attribute__((unused)),

                      const char **groups __attribute__((unused))) {}

		       const char **argv __attribute__((unused)),

		       const char **groups __attribute__((unused)))

{}



void mysql_server_end() {}

void mysql_server_end()

{}



my_bool mysql_thread_init()

{

libmysqld/lib_sql.cc

+14 −23
Original line number Diff line number Diff line
@@ -245,15 +245,6 @@ if (protocol_version>9) net -> return_errno=1; 
}























static bool check_user(THD *thd,enum_server_command command, const char *user,

		       const char *passwd, const char *db, bool check_count)

{
@@ -317,7 +308,7 @@ static bool check_user(THD *thd,enum_server_command command, const char *user, 




extern "C"{

void mysql_server_init(int argc, char **argv, const char **groups)

void mysql_server_init(int argc, const char **argv, const char **groups)

{

  char hostname[FN_REFLEN];
@@ -331,7 +322,7 @@ void mysql_server_init(int argc, char **argv, const char **groups) 
  if (argc)

  {

    argcp = &argc;

    argvp = &argv;

    argvp = (char***) &argv;

  }

  else

  {
@@ -343,7 +334,7 @@ void mysql_server_init(int argc, char **argv, const char **groups) 


  my_umask=0660;		// Default umask for new files

  my_umask_dir=0700;		// Default umask for new directories

  MY_INIT((char *)"mysqld");		// init my_sys library & pthreads

  MY_INIT((char *)"mysqld_server");	// init my_sys library & pthreads

  tzset();			// Set tzname



  start_time=time((time_t*) 0);