Commit 68ced7fb authored by unknown's avatar unknown
Browse files

Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1 

into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint


configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
parents bf5802c3 42ca1e31

BUILD/autorun.sh

+0 −5
Original line number Diff line number Diff line
@@ -11,11 +11,6 @@ if [ -f /usr/bin/glibtoolize ] 
    LIBTOOLIZE=libtoolize

fi



(cd storage/bdb/dist && sh s_all)

(cd storage/innobase && aclocal && autoheader && \

    $LIBTOOLIZE --automake --force --copy && \

    automake --force --add-missing --copy && autoconf)



aclocal || die "Can't execute aclocal" 

autoheader || die "Can't execute autoheader"

# --force means overwrite ltmain.sh script if it already exists

CMakeLists.txt

+3 −0
Original line number Diff line number Diff line
@@ -136,6 +136,9 @@ ENDIF(WITH_CSV_STORAGE_ENGINE) 
IF(WITH_EXAMPLE_STORAGE_ENGINE)

  ADD_SUBDIRECTORY(storage/example)

ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)

IF(WITH_FEDERATED_STORAGE_ENGINE)

  ADD_SUBDIRECTORY(storage/federated)

ENDIF(WITH_FEDERATED_STORAGE_ENGINE)

IF(WITH_INNOBASE_STORAGE_ENGINE)

  ADD_SUBDIRECTORY(storage/innobase)

ENDIF(WITH_INNOBASE_STORAGE_ENGINE)

client/mysql.cc

+0 −1
Original line number Diff line number Diff line
@@ -2356,7 +2356,6 @@ print_table_data(MYSQL_RES *result) 
      const char *buffer;

      uint data_length;

      uint field_max_length;

      bool right_justified;

      uint visible_length;

      uint extra_padding;

configure.in

+0 −50
Original line number Diff line number Diff line
@@ -2137,65 +2137,15 @@ MYSQL_CHECK_SSL 
# Has to be done late, as the plugin may need to check for existence of

# functions tested above

#--------------------------------------------------------------------



MYSQL_STORAGE_ENGINE(blackhole,,[Blackhole Storage Engine],

        [Basic Write-only Read-never tables], [max,max-no-ndb])

MYSQL_PLUGIN_DIRECTORY(blackhole, [storage/blackhole])

MYSQL_PLUGIN_STATIC(blackhole,  [libblackhole.a])

MYSQL_PLUGIN_DYNAMIC(blackhole, [ha_blackhole.la])



MYSQL_STORAGE_ENGINE(csv,,      [CSV Storage Engine],

        [Stores tables in text CSV format])

MYSQL_PLUGIN_DIRECTORY(csv,     [storage/csv])

MYSQL_PLUGIN_STATIC(csv,        [libcsv.a])

MYSQL_PLUGIN_MANDATORY(csv)     dnl Used for logging



MYSQL_STORAGE_ENGINE(federated,,[Federated Storage Engine],

        [Connects to tables on remote MySQL servers], [max,max-no-ndb])



MYSQL_PLUGIN(ftexample,         [Simple Parser],

        [Simple full-text parser plugin])

MYSQL_PLUGIN_DIRECTORY(ftexample, [plugin/fulltext])

MYSQL_PLUGIN_DYNAMIC(ftexample, [mypluglib.la])



MYSQL_STORAGE_ENGINE(heap,no,   [Memory Storage Engine],

        [Volatile memory based tables])

MYSQL_PLUGIN_DIRECTORY(heap,    [storage/heap])

MYSQL_PLUGIN_STATIC(heap,       [libheap.a])

MYSQL_PLUGIN_MANDATORY(heap)    dnl Memory tables



MYSQL_STORAGE_ENGINE(innobase,  innodb, [InnoDB Storage Engine],

        [Transactional Tables using InnoDB], [max,max-no-ndb])

MYSQL_PLUGIN_DIRECTORY(innobase, [storage/innobase])

MYSQL_PLUGIN_STATIC(innobase,   [libinnobase.a])

MYSQL_PLUGIN_ACTIONS(innobase,  [

  AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])

  AC_SUBST(innodb_system_libs)

])



MYSQL_STORAGE_ENGINE(myisam,no, [MyISAM Storage Engine],

        [Traditional non-transactional MySQL tables])

MYSQL_PLUGIN_DIRECTORY(myisam,  [storage/myisam])

MYSQL_PLUGIN_STATIC(myisam,     [libmyisam.a])

MYSQL_PLUGIN_MANDATORY(myisam)  dnl Default



MYSQL_STORAGE_ENGINE(myisammrg,no,[MyISAM MERGE Engine],

        [Merge multiple MySQL tables into one])

MYSQL_PLUGIN_DIRECTORY(myisammrg,[storage/myisammrg])

MYSQL_PLUGIN_STATIC(myisammrg,  [libmyisammrg.a])

MYSQL_PLUGIN_MANDATORY(myisammrg)



MYSQL_STORAGE_ENGINE(ndbcluster, ndbcluster, [Cluster Storage Engine],

        [High Availability Clustered tables], [max])

MYSQL_PLUGIN_DIRECTORY(ndbcluster,[storage/ndb])

MYSQL_PLUGIN_STATIC(ndbcluster, [[\$(ndbcluster_libs) \$(ndbcluster_system_libs) \$(NDB_SCI_LIBS)]])

MYSQL_PLUGIN_ACTIONS(ndbcluster,[MYSQL_SETUP_NDBCLUSTER])



MYSQL_STORAGE_ENGINE(partition, partition, [Partition Support],

        [MySQL Partitioning Support], [max,max-no-ndb])



dnl -- ndbcluster requires partition to be enabled

MYSQL_PLUGIN_DEPENDS(ndbcluster, [partition])



MYSQL_CONFIGURE_PLUGINS([none])

libmysqld/CMakeLists.txt

+4 −2
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc 
            ../sql-common/pack.c ../sql/derror.cc ../sql/event_scheduler.cc

            ../sql/event_timed.cc ../sql/events.cc ../sql/discover.cc

            ../sql/field_conv.cc ../sql/field.cc ../sql/filesort.cc

            ../sql/gstream.cc ../sql/ha_heap.cc ../sql/ha_myisam.cc

            ../sql/ha_myisammrg.cc ${mysql_se_ha_src}

            ../sql/gstream.cc ${mysql_se_ha_src}

            ../sql/handler.cc ../sql/hash_filo.cc

            ../sql/hostname.cc ../sql/init.cc ../sql/item_buff.cc

            ../sql/item_cmpfunc.cc ../sql/item.cc ../sql/item_create.cc
@@ -80,6 +79,9 @@ ENDIF(WITH_ARCHIVE_STORAGE_ENGINE) 
IF(WITH_EXAMPLE_STORAGE_ENGINE)

  ADD_DEPENDENCIES(mysqlserver example)

ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)

IF(WITH_FEDERATED_STORAGE_ENGINE)

  ADD_DEPENDENCIES(mysqlserver federated)

ENDIF(WITH_FEDERATED_STORAGE_ENGINE)

IF(WITH_INNOBASE_STORAGE_ENGINE)

  ADD_DEPENDENCIES(mysqlserver innobase)

ENDIF(WITH_INNOBASE_STORAGE_ENGINE)