Commit 526488f1 authored by unknown's avatar unknown
Browse files

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

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


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents 94814c6f 8628f2c8

config/ac-macros/ha_federated.m4

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ AC_DEFUN([MYSQL_CHECK_FEDERATED], [ 
  AC_ARG_WITH([federated-storage-engine],

              [

  --with-federated-storage-engine

                        Enable the MySQL Storage Engine],

                        Enable the MySQL Federated Storage Engine],

              [federateddb="$withval"],

              [federateddb=no])

  AC_MSG_CHECKING([for MySQL federated storage engine])

extra/yassl/mySTL/helpers.hpp

+1 −7
Original line number Diff line number Diff line
@@ -28,14 +28,11 @@ 
#define mySTL_HELPERS_HPP



#include <stdlib.h>

#include <new>        // placement new







#ifdef __IBMCPP__

/*

      Workaround for the lack of operator new(size_t, void*)

      in IBM VA C++ 6.0

      Also used as a workaround to avoid including <new>

*/

    struct Dummy {};
@@ -45,9 +42,6 @@ 
    }



    typedef Dummy* yassl_pointer;

#else

    typedef void*  yassl_pointer;

#endif





namespace mySTL {

extra/yassl/mySTL/list.hpp

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ void list<T>::push_front(T t) 
{

    void* mem = malloc(sizeof(node));

    if (!mem) abort();

    node* add = new (mem) node(t);

    node* add = new (reinterpret_cast<yassl_pointer>(mem)) node(t);



    if (head_) {

        add->next_ = head_;
@@ -210,7 +210,7 @@ void list<T>::push_back(T t) 
{

    void* mem = malloc(sizeof(node));

    if (!mem) abort();

    node* add = new (mem) node(t);

    node* add = new (reinterpret_cast<yassl_pointer>(mem)) node(t);



    if (tail_) {

        tail_->next_ = add;

extra/yassl/taocrypt/src/misc.cpp

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 


#include "runtime.hpp"

#include "misc.hpp"

#include <new>        // for NewHandler





void* operator new(size_t sz, TaoCrypt::new_t)

mysql-test/r/federated_archive.result

0 → 100644
+48 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

stop slave;

DROP DATABASE IF EXISTS federated;

CREATE DATABASE federated;

DROP DATABASE IF EXISTS federated;

CREATE DATABASE federated;

DROP TABLE IF EXISTS federated.archive_table;

CREATE TABLE federated.archive_table (

`id` int(4) NOT NULL,

`name` varchar(54) default NULL

) ENGINE=ARCHIVE DEFAULT CHARSET=latin1;

DROP TABLE IF EXISTS federated.t1;

CREATE TABLE federated.t1 (

`id` int(4) NOT NULL,

`name` varchar(54) default NULL,

PRIMARY KEY (`id`)

)

ENGINE="FEDERATED" DEFAULT CHARSET=latin1

COMMENT='mysql://root@127.0.0.1:SLAVE_PORT/federated/archive_table';

INSERT INTO federated.t1 (id, name) VALUES (1, 'foo');

INSERT INTO federated.t1 (id, name) VALUES (2, 'bar');

SELECT * FROM federated.t1;

id	name

1	foo

2	bar

DELETE FROM federated.t1 WHERE id = 1;

ERROR HY000: There was a problem processing the query on the foreign data source. Data source error: ': 1031 : Table storage engine for 'archive_table' doesn't have t'

SELECT * FROM federated.t1;

id	name

1	foo

2	bar

UPDATE federated.t1 SET name='baz' WHERE id = 1;

ERROR HY000: There was a problem processing the query on the foreign data source. Data source error: ': 1031 : Table storage engine for 'archive_table' doesn't have t'

SELECT * FROM federated.t1;

id	name

1	foo

2	bar

DROP TABLE federated.t1;

DROP TABLE federated.archive_table;

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;