1. 20 May, 2005 5 commits
    • unknown's avatar
      Fixes for numerous compatibility problems in yaSSL. · 08c8c29c
      unknown authored
      
      extra/yassl/include/openssl/ssl.h:
        Fix -std=c++98 mode compilation failures.
      extra/yassl/include/yassl_error.hpp:
        Fix -std=c++98 mode compilation failures.
      extra/yassl/include/yassl_types.hpp:
        Fix -std=c++98 mode compilation failures.
      extra/yassl/mySTL/helpers.hpp:
        Fix AIX 5.2 compilation problem.
      extra/yassl/taocrypt/include/asn.hpp:
        Fix -std=c++98 mode compilation failures.
      vio/Makefile.am:
        Add a dummy C++ file to SSL tests to make libtool use a C++ linker:
        this lets ssl tests link when using yaSSL and a non-gcc C++ compiler.
      08c8c29c
    • unknown's avatar
      Merge mysql.com:/usr/home/ram/work/mysql-4.1-build · eb5fbcbb
      unknown authored
      into mysql.com:/usr/home/ram/work/mysql-5.0-build
      
      eb5fbcbb
    • unknown's avatar
      a fix (bug #10757: gis-rtree.test fails) · 526525dc
      unknown authored
      
      
      myisam/sp_key.c:
        a fix (bug #10757: gis-rtree.test fails)
        float8get() doesn't properly work with local variables sometimes.
      526525dc
    • unknown's avatar
      my_vsnprintf.c, sql_select.cc, sql_delete.cc, field_conv.cc, rt_split.c: · 5c950a89
      unknown authored
        Fixes for valgrind errors and compatiblity issues by Monty
      
      
      myisam/rt_split.c:
        Fixes for valgrind errors and compatiblity issues by Monty
      sql/field_conv.cc:
        Fixes for valgrind errors and compatiblity issues by Monty
      sql/sql_delete.cc:
        Fixes for valgrind errors and compatiblity issues by Monty
      sql/sql_select.cc:
        Fixes for valgrind errors and compatiblity issues by Monty
      strings/my_vsnprintf.c:
        Fixes for valgrind errors and compatiblity issues by Monty
      5c950a89
    • unknown's avatar
      addition of "REFERENCED_TABLE_SCHEMA", · 61fd55ac
      unknown authored
        "REFERENCED_TABLE_NAME", "REFERENCED_COLUMN_NAME" fields into
        KEY_COLUMN_USAGE table
      
      
      61fd55ac
  2. 19 May, 2005 29 commits
  3. 18 May, 2005 6 commits
    • unknown's avatar
      Fixes to merge from 4.1 · 9f02364e
      unknown authored
      
      client/mysqldump.c:
        Temporarily disable unused (and broken) code.
      mysql-test/r/group_min_max.result:
        Update results
      mysql-test/r/mysqldump.result:
        Update results
      mysql-test/r/subselect.result:
        Update results
      mysql-test/t/group_min_max.test:
        Ignore number of rows in output of most explain results
      sql/sql_insert.cc:
        Fix reference to max_unique_length
      9f02364e
    • unknown's avatar
      Resolve merge from 4.1 · db69bf2d
      unknown authored
      
      mysql-test/r/grant_cache.result:
        Auto merged
      mysql-test/r/merge.result:
        Auto merged
      mysql-test/t/grant_cache.test:
        Auto merged
      mysql-test/t/merge.test:
        Auto merged
      sql/ha_myisammrg.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/handler.h:
        Resolve merge
      sql/table.cc:
        Resolve merge
      db69bf2d
    • unknown's avatar
      Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1 · b5ca7a75
      unknown authored
      into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1
      
      b5ca7a75
    • unknown's avatar
      Merge · 91d4744c
      unknown authored
      
      ndb/include/kernel/ndb_limits.h:
        Auto merged
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      mysys/thr_alarm.c:
        Manual merge
      91d4744c
    • unknown's avatar
      BUG#9626 · efdd7c85
      unknown authored
       - Fix valgrind warnings
       - Remove static db, schema and table name buffers from Ndb.cpp
      
      
      mysys/thr_alarm.c:
        Initialise sact to zero
      ndb/include/kernel/ndb_limits.h:
        Set MAX_ATTR_NAME_SIZE to NAME_LEN which is tha maximum in MySQL
      ndb/include/kernel/signaldata/GetTabInfo.hpp:
        Clean up
      ndb/include/ndbapi/Ndb.hpp:
        Remove NDB_MAX_INTERNAL_NAME_LENGTH and all char buffers for schema, db and tablename.
        Made them dynamic and moved to NdbImpl.hpp
      ndb/include/ndbapi/ndbapi_limits.h:
        Remove the static length's of attr, db, schema and table name.
      ndb/src/common/transporter/Packer.cpp:
        Set theSignalId to ~0 when unpacking signal
      ndb/src/ndbapi/Ndb.cpp:
        Moved schema, database and tablename to NdbImpl.hpp
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Add NdbIndexImpl::init and NdbEventImpl::init
        Init all vars in NdbIndexImpl, NdbEventImpl, NdbTableImpl and NdbIndexImpl
        Delete the pseudo column NDB$RANGE_NO
        Copy tablename to internal buff in NdbDictInterface to get proper alignment.
        Convert length of table name from bytes words, when setting sz of LinearSectionPtr
        Set LinearSectionPtr array size to number of LinearSections used - save some stack.
      ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Add NdbEventImpl::init and NdbIndexImpl::init
        Remove clearNewProperties and copyNewProperties, it's easier to check if all vars are initied if it's done in the same func.
        Add buffer for tabname ti NdbDictInterface, memset it to 0 in initializer.
      ndb/src/ndbapi/NdbImpl.hpp:
        Use BaseString for table, schema and db names.
      ndb/src/ndbapi/Ndbinit.cpp:
        Move schema and db name to NdbImpl and use BaseString
      ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Destroy ndb_global_event_buffer_mutex and ndb_print_state_mutex
      sql/ha_ndbcluster.cc:
        Check if pTrans is not null before calling closeTransaction
        Remove NDB_MAX_ATTR_NAME_SIZE
        Remove truncation of attr names. When attr name length is same in NDB as in MySQL this will be checked in functin check_column_name
      efdd7c85
    • unknown's avatar
      merge · 52b08ea4
      unknown authored
      
      sql/mysqld.cc:
        Auto merged
      52b08ea4