Commit 4fdf9183 authored by unknown's avatar unknown
Browse files

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

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


configure.in:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/include/ndb_version.h.in:
  Auto merged
storage/ndb/include/portlib/NdbTCP.h:
  Auto merged
storage/ndb/include/transporter/TransporterRegistry.hpp:
  Auto merged
storage/ndb/include/util/SocketServer.hpp:
  Auto merged
storage/ndb/include/util/ndb_opts.h:
  Auto merged
storage/ndb/include/util/version.h:
  Auto merged
storage/ndb/src/common/logger/LogHandler.cpp:
  Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
storage/ndb/src/common/portlib/NdbMutex.c:
  Auto merged
storage/ndb/src/common/portlib/NdbTCP.cpp:
  Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
  Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
  Auto merged
storage/ndb/src/common/transporter/Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/common/util/Parser.cpp:
  Auto merged
storage/ndb/src/common/util/SocketClient.cpp:
  Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
  Auto merged
storage/ndb/src/common/util/version.c:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmapi/ndb_logevent.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmclient/main.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
parents ae0af202 9e1cf0e2

libmysql/libmysql.c

+25 −6
Original line number Diff line number Diff line
@@ -1774,6 +1774,7 @@ static int stmt_read_row_unbuffered(MYSQL_STMT *stmt, unsigned char **row); 
static int stmt_read_row_buffered(MYSQL_STMT *stmt, unsigned char **row);

static int stmt_read_row_from_cursor(MYSQL_STMT *stmt, unsigned char **row);

static int stmt_read_row_no_data(MYSQL_STMT *stmt, unsigned char **row);

static int stmt_read_row_no_result_set(MYSQL_STMT *stmt, unsigned char **row);



/*

  This function is used in mysql_stmt_store_result if
@@ -1869,6 +1870,16 @@ static void net_clear_error(NET *net) 
  }

}



static void stmt_clear_error(MYSQL_STMT *stmt)

{

  if (stmt->last_errno)

  {

    stmt->last_errno= 0;

    stmt->last_error[0]= '\0';

    strmov(stmt->sqlstate, not_error_sqlstate);

  }

}



/*

  Set statement error code, sqlstate, and error message

  from given errcode and sqlstate.
@@ -2026,7 +2037,7 @@ mysql_stmt_init(MYSQL *mysql) 
  stmt->list.data= stmt;

  stmt->state= MYSQL_STMT_INIT_DONE;

  stmt->mysql= mysql;

  stmt->read_row_func= stmt_read_row_no_data;

  stmt->read_row_func= stmt_read_row_no_result_set;

  stmt->prefetch_rows= DEFAULT_PREFETCH_ROWS;

  /* The rest of statement members was bzeroed inside malloc */
@@ -2768,6 +2779,13 @@ stmt_read_row_from_cursor(MYSQL_STMT *stmt, unsigned char **row) 
static int

stmt_read_row_no_data(MYSQL_STMT *stmt  __attribute__((unused)),

                      unsigned char **row  __attribute__((unused)))

{

  return MYSQL_NO_DATA;

}



static int

stmt_read_row_no_result_set(MYSQL_STMT *stmt  __attribute__((unused)),

                      unsigned char **row  __attribute__((unused)))

{

  set_stmt_error(stmt, CR_NO_RESULT_SET, unknown_sqlstate);

  return 1;
@@ -4590,7 +4608,8 @@ int STDCALL mysql_stmt_fetch(MYSQL_STMT *stmt) 
      ((rc= stmt_fetch_row(stmt, row)) && rc != MYSQL_DATA_TRUNCATED))

  {

    stmt->state= MYSQL_STMT_PREPARE_DONE;       /* XXX: this is buggy */

    stmt->read_row_func= stmt_read_row_no_data;

    stmt->read_row_func= (rc == MYSQL_NO_DATA) ? 

      stmt_read_row_no_data : stmt_read_row_no_result_set;

  }

  else

  {
@@ -4907,13 +4926,12 @@ static my_bool reset_stmt_handle(MYSQL_STMT *stmt, uint flags) 
  {

    MYSQL *mysql= stmt->mysql;

    MYSQL_DATA *result= &stmt->result;

    my_bool has_cursor= stmt->read_row_func == stmt_read_row_from_cursor;



    /*

      Reset stored result set if so was requested or it's a part

      of cursor fetch.

    */

    if (result->data && (has_cursor || (flags & RESET_STORE_RESULT)))

    if (result->data && (flags & RESET_STORE_RESULT))

    {

      /* Result buffered */

      free_root(&result->alloc, MYF(MY_KEEP_PREALLOC));
@@ -4928,7 +4946,7 @@ static my_bool reset_stmt_handle(MYSQL_STMT *stmt, uint flags) 
      for (; param < param_end; param++)

        param->long_data_used= 0;

    }

    stmt->read_row_func= stmt_read_row_no_data;

    stmt->read_row_func= stmt_read_row_no_result_set;

    if (mysql)

    {

      if ((int) stmt->state > (int) MYSQL_STMT_PREPARE_DONE)
@@ -4944,7 +4962,7 @@ static my_bool reset_stmt_handle(MYSQL_STMT *stmt, uint flags) 
          mysql->status= MYSQL_STATUS_READY;

        }

      }

      if (has_cursor || (flags & RESET_SERVER_SIDE))

      if (flags & RESET_SERVER_SIDE)

      {

        /*

          Reset the server side statement and close the server side
@@ -4960,6 +4978,7 @@ static my_bool reset_stmt_handle(MYSQL_STMT *stmt, uint flags) 
          stmt->state= MYSQL_STMT_INIT_DONE;

          return 1;

        }

        stmt_clear_error(stmt);

      }

    }

    stmt->state= MYSQL_STMT_PREPARE_DONE;

mysql-test/r/ctype_utf8.result

+4 −0
Original line number Diff line number Diff line
@@ -905,6 +905,10 @@ select * from t1 where city = 'Durban '; 
id	city

2	Durban

drop table t1;

create table t1 (x set('A', 'B') default 0) character set utf8;

ERROR 42000: Invalid default value for 'x'

create table t1 (x enum('A', 'B') default 0) character set utf8;

ERROR 42000: Invalid default value for 'x'

SET NAMES UTF8;

CREATE TABLE t1 (

`id` int(20) NOT NULL auto_increment,

mysql-test/r/fulltext_order_by.result

+74 −0
Original line number Diff line number Diff line
@@ -86,3 +86,77 @@ a rel 
1	1

2	2

drop table t1;

CREATE TABLE t1 (

id int(11) NOT NULL auto_increment,

thread int(11) NOT NULL default '0',

beitrag longtext NOT NULL,

PRIMARY KEY  (id),

KEY thread (thread),

FULLTEXT KEY beitrag (beitrag)

) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=7923 ;

CREATE TABLE t2 (

id int(11) NOT NULL auto_increment,

text varchar(100) NOT NULL default '',

PRIMARY KEY  (id),

KEY text (text)

) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=63 ;

CREATE TABLE t3 (

id int(11) NOT NULL auto_increment,

forum int(11) NOT NULL default '0',

betreff varchar(70) NOT NULL default '',

PRIMARY KEY  (id),

KEY forum (forum),

FULLTEXT KEY betreff (betreff)

) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=996 ;

select a.text, b.id, b.betreff

from 

t2 a inner join t3 b on a.id = b.forum inner join

t1 c on b.id = c.thread

where 

match(b.betreff) against ('+abc' in boolean mode)

group by a.text, b.id, b.betreff

union

select a.text, b.id, b.betreff

from 

t2 a inner join t3 b on a.id = b.forum inner join

t1 c on b.id = c.thread

where 

match(c.beitrag) against ('+abc' in boolean mode)

group by 

a.text, b.id, b.betreff

order by 

match(b.betreff) against ('+abc' in boolean mode) desc;

ERROR 42S02: Unknown table 'b' in order clause

select a.text, b.id, b.betreff

from 

t2 a inner join t3 b on a.id = b.forum inner join

t1 c on b.id = c.thread

where 

match(b.betreff) against ('+abc' in boolean mode)

union

select a.text, b.id, b.betreff

from 

t2 a inner join t3 b on a.id = b.forum inner join

t1 c on b.id = c.thread

where 

match(c.beitrag) against ('+abc' in boolean mode)

order by 

match(b.betreff) against ('+abc' in boolean mode) desc;

ERROR 42S02: Unknown table 'b' in order clause

select a.text, b.id, b.betreff

from 

t2 a inner join t3 b on a.id = b.forum inner join

t1 c on b.id = c.thread

where 

match(b.betreff) against ('+abc' in boolean mode)

union

select a.text, b.id, b.betreff

from 

t2 a inner join t3 b on a.id = b.forum inner join

t1 c on b.id = c.thread

where 

match(c.beitrag) against ('+abc' in boolean mode)

order by 

match(betreff) against ('+abc' in boolean mode) desc;

ERROR HY000: The used table type doesn't support FULLTEXT indexes

drop table t1,t2,t3;

mysql-test/r/innodb.result

+9 −0
Original line number Diff line number Diff line
@@ -2466,3 +2466,12 @@ select * from t1; 
a	val

2	1

drop table t1;

CREATE TABLE t1 (GRADE DECIMAL(4) NOT NULL, PRIMARY KEY (GRADE)) ENGINE=INNODB;

INSERT INTO t1 (GRADE) VALUES (151),(252),(343);

SELECT GRADE  FROM t1 WHERE GRADE > 160 AND GRADE < 300;

GRADE

252

SELECT GRADE  FROM t1 WHERE GRADE= 151;

GRADE

151

DROP TABLE t1;

mysql-test/r/ps.result

+113 −0
Original line number Diff line number Diff line
@@ -681,3 +681,116 @@ execute stmt; 
execute stmt;

deallocate prepare stmt;

drop table t1;

create table t1 (

id int(11) unsigned not null primary key auto_increment,

partner_id varchar(35) not null,

t1_status_id int(10) unsigned

);

insert into t1 values ("1", "partner1", "10"), ("2", "partner2", "10"),

("3", "partner3", "10"), ("4", "partner4", "10");

create table t2 (

id int(11) unsigned not null default '0',

t1_line_id int(11) unsigned not null default '0',

article_id varchar(20),

sequence int(11) not null default '0',

primary key  (id,t1_line_id)

);

insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"),

("2", "2", "sup", "2"), ("2", "3", "sup", "3"),

("2", "4", "imp", "4"), ("3", "1", "sup", "0"),

("4", "1", "sup", "0");

create table t3 (

id int(11) not null default '0',

preceeding_id int(11) not null default '0',

primary key  (id,preceeding_id)

);

create table t4 (

user_id varchar(50) not null,

article_id varchar(20) not null,

primary key  (user_id,article_id)

);

insert into t4 values("nicke", "imp");

prepare stmt from

'select distinct t1.partner_id

from t1 left join t3 on t1.id = t3.id

     left join t1 pp on pp.id = t3.preceeding_id

where

  exists (

    select *

    from t2 as pl_inner

    where pl_inner.id = t1.id

    and pl_inner.sequence <= (

      select min(sequence) from t2 pl_seqnr

      where pl_seqnr.id = t1.id

    )

    and exists (

      select * from t4

      where t4.article_id = pl_inner.article_id

      and t4.user_id = ?

    )

  )

  and t1.id = ?

group by t1.id

having count(pp.id) = 0';

set @user_id = 'nicke';

set @id = '2';

execute stmt using @user_id, @id;

partner_id

execute stmt using @user_id, @id;

partner_id

deallocate prepare stmt;

drop table t1, t2, t3, t4;

prepare stmt from 'select ?=?';

set @a='CHRISTINE           ';

set @b='CHRISTINE';

execute stmt using @a, @b;

?=?

1

execute stmt using @a, @b;

?=?

1

set @a=1, @b=2;

execute stmt using @a, @b;

?=?

0

set @a='CHRISTINE           ';

set @b='CHRISTINE';

execute stmt using @a, @b;

?=?

1

deallocate prepare stmt;

create table t1 (utext varchar(20) character set ucs2);

insert into t1 values ("lily");

insert into t1 values ("river");

prepare stmt from 'select utext from t1 where utext like ?';

set @param1='%%';

execute stmt using @param1;

utext

lily

river

execute stmt using @param1;

utext

lily

river

select utext from t1 where utext like '%%';

utext

lily

river

drop table t1;

deallocate prepare stmt;

create table t1 (a int);

prepare stmt from "select ??";

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '?' at line 1

prepare stmt from "select ?FROM t1";

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '?FROM t1' at line 1

prepare stmt from "select FROM t1 WHERE?=1";

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FROM t1 WHERE?=1' at line 1

prepare stmt from "update t1 set a=a+?WHERE 1";

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '?WHERE 1' at line 1

select ?;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '?' at line 1

select ??;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '??' at line 1

select ? from t1;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? from t1' at line 1

drop table t1;