Commit 5459c970 authored by unknown's avatar unknown
Browse files

Merge xiphis.org:/home/antony/work2/mysql-5.1 

into  xiphis.org:/home/antony/work3/mysql-5.1-plugable-2


configure.in:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/sql_table.cc:
  SCCS merged
parents ec6121fb 613dd50a

config/ac-macros/storage.m4

+7 −4
Original line number Diff line number Diff line
@@ -34,11 +34,14 @@ AC_CACHE_CHECK([whether to use $2], [mysql_cv_use_]m4_bpatsubst([$3], -, _), 
[mysql_cv_use_]m4_bpatsubst([$3], -, _)=[$with_]m4_bpatsubst([$3], -, _))

AH_TEMPLATE([$5], [Build $2])

if test "[$mysql_cv_use_]m4_bpatsubst([$3], -, _)" != no; then

if test "$6" != "no"

then

  AC_DEFINE([$5])

  mysql_se_decls="${mysql_se_decls},$6"

  mysql_se_htons="${mysql_se_htons},&$6"

mysql_se_dirs="$mysql_se_dirs $7"

  mysql_se_objs="$mysql_se_objs $8"

fi

mysql_se_dirs="$mysql_se_dirs $7"

mysql_se_libs="$mysql_se_libs $9"

$10

fi

configure.in

+7 −2
Original line number Diff line number Diff line
@@ -2432,9 +2432,14 @@ MYSQL_STORAGE_ENGINE(innobase,,innodb,,,,storage/innobase,ha_innodb.o,[ dnl 
MYSQL_STORAGE_ENGINE(berkeley,,berkeley-db,,,,storage/bdb,,,[

  MYSQL_SETUP_BERKELEY_DB

])

MYSQL_STORAGE_ENGINE(example)

MYSQL_STORAGE_ENGINE(example,,,,,no,storage/example,,,[

  AC_CONFIG_FILES(storage/example/Makefile)

])

MYSQL_STORAGE_ENGINE(archive)

MYSQL_STORAGE_ENGINE(csv,,,,,tina_hton,,ha_tina.o)

dnl MYSQL_STORAGE_ENGINE(csv,,,,,tina_hton,,ha_tina.o)

MYSQL_STORAGE_ENGINE(csv,,,,,no,storage/csv,,,[

  AC_CONFIG_FILES(storage/csv/Makefile)

])

MYSQL_STORAGE_ENGINE(blackhole)

MYSQL_STORAGE_ENGINE(federated)

MYSQL_STORAGE_ENGINE(ndbcluster,,ndbcluster,,,,storage/ndb,,,[

include/plugin.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ struct st_mysql_plugin 
  int type;             /* the plugin type (a MYSQL_XXX_PLUGIN value)   */

  void *info;           /* pointer to type-specific plugin descriptor   */

  const char *name;     /* plugin name                                  */

  uint version;         /* plugin version                               */

  const char *author;   /* plugin author (for SHOW PLUGINS)             */

  const char *descr;    /* general descriptive text (for SHOW PLUGINS ) */

  int (*init)(void);    /* the function to invoke when plugin is loaded */

mysql-test/r/bdb.result

+34 −0
Original line number Diff line number Diff line
@@ -285,6 +285,40 @@ n 
4

5

6

set autocommit=0;

begin;

savepoint `my_savepoint`;

insert into t1 values (7);

savepoint `savept2`;

insert into t1 values (3);

select n from t1;

n

3

4

5

6

7

savepoint savept3;

rollback to savepoint savept2;

rollback to savepoint savept3;

ERROR 42000: SAVEPOINT savept3 does not exist

rollback to savepoint savept2;

release savepoint `my_savepoint`;

select n from t1;

n

4

5

6

7

rollback to savepoint `my_savepoint`;

ERROR 42000: SAVEPOINT my_savepoint does not exist

rollback to savepoint savept2;

ERROR 42000: SAVEPOINT savept2 does not exist

insert into t1 values (8);

savepoint sv;

commit;

savepoint sv;

set autocommit=1;

rollback;

drop table t1;

create table t1 ( id int NOT NULL PRIMARY KEY, nom varchar(64)) engine=BDB;

mysql-test/r/information_schema.result

+4 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ COLLATION_CHARACTER_SET_APPLICABILITY 
COLUMNS

COLUMN_PRIVILEGES

KEY_COLUMN_USAGE

PLUGINS

ROUTINES

SCHEMATA

SCHEMA_PRIVILEGES
@@ -723,7 +724,7 @@ CREATE TABLE t_crashme ( f1 BIGINT); 
CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1;

CREATE VIEW a2 AS SELECT t_CRASHME FROM a1;

count(*)

102

103

drop view a2, a1;

drop table t_crashme;

select table_schema,table_name, column_name from
@@ -731,6 +732,7 @@ information_schema.columns 
where data_type = 'longtext';

table_schema	table_name	column_name

information_schema	COLUMNS	COLUMN_TYPE

information_schema	PLUGINS	PLUGIN_DESCRIPTION

information_schema	ROUTINES	ROUTINE_DEFINITION

information_schema	ROUTINES	SQL_MODE

information_schema	TRIGGERS	ACTION_CONDITION
@@ -793,7 +795,7 @@ delete from mysql.db where user='mysqltest_4'; 
flush privileges;

SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA;

table_schema	count(*)

information_schema	16

information_schema	17

mysql	18

create table t1 (i int, j int);

create trigger trg1 before insert on t1 for each row