1. 11 Nov, 2004 3 commits
    • unknown's avatar
      Result of · 3a98b783
      unknown authored
      WL#2225 Extend the test cases for PS + develop a basic test routine for PS
         The basic test routine 
             mysql-test/include/patchwork-check.inc
         Test cases for the the basic test routine 
             mysql-test/t/tool_test.test    
             mysql-test/r/tool_test.result
      
         Test cases for prepared statements with functions
             mysql-test/t/ps_12func.test
             mysql-test/r/ps_12func.result
         Some statements are set to comment, because of open bugs.
      
      Fresh MySQL V4.1 and V5.0 souces produce in the moment (~11-Nov-2004) the
      same result files.  
      
      
      3a98b783
    • unknown's avatar
      Added ending ';' for the start_transaction_opts: · 02d8fa29
      unknown authored
      02d8fa29
    • unknown's avatar
      fill_help_tables.sh: · bdea2dc9
      unknown authored
        Handle some additional Texinfo tags that were being missed.
      
      
      scripts/fill_help_tables.sh:
        Handle some additional Texinfo tags that were being missed.
      bdea2dc9
  2. 10 Nov, 2004 22 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6b1450d9
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-clean
      
      
      sql/handler.cc:
        Auto merged
      6b1450d9
    • unknown's avatar
      no new message in 4.1 (causes merge issues with 5.0). Using ER_UNKNOW_ERROR... · b6eb77f7
      unknown authored
      no new message in 4.1 (causes merge issues with 5.0). Using ER_UNKNOW_ERROR and hardcoded message string instead.
      
      
      include/mysqld_error.h:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/handler.cc:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/czech/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/danish/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/dutch/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/english/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/estonian/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/french/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/german/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/greek/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/hungarian/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/italian/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/japanese/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/korean/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/norwegian-ny/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/norwegian/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/polish/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/portuguese/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/romanian/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/russian/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/serbian/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/slovak/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/spanish/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/swedish/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      sql/share/ukrainian/errmsg.txt:
        no new message in 4.1 (causes merge issues with 5.0)
      b6eb77f7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 71196720
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/handler.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      71196720
    • unknown's avatar
      Added possibility to detect if libmysqld is restarted · 5205078e
      unknown authored
      (Needed to check if memory allocated with mysql_once_init() has been freed)
      
      
      
      include/my_sys.h:
        Added possibility to detect if libmysqld is restarted
      mysys/my_init.c:
        Added possibility to detect if libmysqld is restarted
      sql/handler.cc:
        Detect if libmysqld is restarted
        Simple optimization of ha_known_exts()
      5205078e
    • unknown's avatar
      Merge mysql.com:/home/bk/mysql-4.1 · 8eae81ba
      unknown authored
      into mysql.com:/users/kboortz/daily/work/mysql-4.1-wax
      
      
      8eae81ba
    • unknown's avatar
      Merge · 3b3285b3
      unknown authored
      
      client/mysqldump.c:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/handler.h:
        SCCS merged
      3b3285b3
    • unknown's avatar
      WL#1596 "make mysqldump --master-data --single-transaction able to do online... · 313ce62f
      unknown authored
      WL#1596 "make mysqldump --master-data --single-transaction able to do online dump of InnoDB AND report reliable
      binlog coordinates corresponding to the dump".
      The good news is that now mysqldump can be used to get an online backup of InnoDB *which works for
      point-in-time recovery and replication slave creation*. Formerly, mysqldump --master-data --single-transaction
      used to call in fact mysqldump --master-data, so the dump was not an online dump (took big lock all time of dump).
      The only lock which is now taken in this patch is at the beginning of the dump: mysqldump does:
      FLUSH TABLES WITH READ LOCK; START TRANSACTION WITH CONSISTENT SNAPSHOT; SHOW MASTER STATUS; UNLOCK TABLES;
      so the lock time is in fact the time FLUSH TABLES WITH READ LOCK takes to return (can be 0 or very long, if
      a table is undergoing a huge update).
      I have done some more minor changes listed in the paragraph of mysqldump.c.
      WL#2237 "WITH CONSISTENT SNAPSHOT clause for START TRANSACTION":
      it's a START TRANSACTION which additionally starts a consistent read on all
      capable storage engine (i.e. InnoDB). So, can serve as a replacement for
      BEGIN; SELECT * FROM some_innodb_table LIMIT 1; which starts a consistent read too. 
      
      
      client/mysqldump.c:
        Main change: mysqldump --single-transaction --master-data is now able to, at the same time,
        take an online dump of InnoDB (using consistent read) AND get the binlog position corresponding to this dump
        (before, using the two options used to silently cancel --single-transaction).
        This uses the new START TRANSACTION WITH CONSISTENT SNAPSHOT syntax.
        Additional changes: 
        a) cleanup:
         - DBerror calls exit() so some code was unneeded
         - no need to call COMMIT at end, leave disconnection do the job
         - mysql_query_with_error_report()
        b) requirements I had heard from colleagues:
         - --master-data now requires an argument, to comment out ("--") the CHANGE MASTER or not
           (commenting had been asked for point-in-time recovery when replication is not necessary).
         - --first-slave is renamed to --lock-all-tables
        c) more sensible behaviours (has been discussed internally):
         - if used with --master-data, --flush-logs is probably intended to get a flush synchronous
           with the dump, not one random flush per dumped db.
         - disabled automatic reconnection as, at least, SQL_MODE would be lost (and also, depending
           on options, LOCK TABLES, BEGIN, FLUSH TABLES WITH READ LOCK).
      include/mysqld_error.h:
        an error if START TRANSACTION WITH CONSISTENT SNAPSHOT is called and there is no consistent-read capable storage engine
        (idea ((C) PeterG) is that it's a bit like CREATE TABLE ENGINE=InnoDB when there is no support for InnoDB).
      sql/handler.cc:
        new ha_start_consistent_snapshot(), which, inside an existing transaction, starts a consistent read
        (offers an alternative to SELECTing any InnoDB table). Does something only for InnoDB.
        Warning if no suitable engine supported.
      sql/handler.h:
        declarations
      sql/lex.h:
        symbols for lex
      sql/share/czech/errmsg.txt:
        new message
      sql/share/danish/errmsg.txt:
        new message
      sql/share/dutch/errmsg.txt:
        new message
      sql/share/english/errmsg.txt:
        new message
      sql/share/estonian/errmsg.txt:
        new message
      sql/share/french/errmsg.txt:
        new message
      sql/share/german/errmsg.txt:
        new message
      sql/share/greek/errmsg.txt:
        new message
      sql/share/hungarian/errmsg.txt:
        new message
      sql/share/italian/errmsg.txt:
        new message
      sql/share/japanese/errmsg.txt:
        new message
      sql/share/korean/errmsg.txt:
        new message
      sql/share/norwegian-ny/errmsg.txt:
        new message
      sql/share/norwegian/errmsg.txt:
        new message
      sql/share/polish/errmsg.txt:
        new message
      sql/share/portuguese/errmsg.txt:
        new message
      sql/share/romanian/errmsg.txt:
        new message
      sql/share/russian/errmsg.txt:
        new message
      sql/share/serbian/errmsg.txt:
        new message
      sql/share/slovak/errmsg.txt:
        new message
      sql/share/spanish/errmsg.txt:
        new message
      sql/share/swedish/errmsg.txt:
        new message
      sql/share/ukrainian/errmsg.txt:
        new message
      sql/sql_lex.h:
        new option in lex (transaction options)
      sql/sql_parse.cc:
        warning comment (never make UNLOCK TABLES commit a transaction, please);
        support for starting consistent snapshot.
      sql/sql_yacc.yy:
        new clause WITH CONSISTENT SNAPSHOT (syntax ok'd by PeterG) for START TRANSACTION.
      313ce62f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 834d58a6
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      834d58a6
    • unknown's avatar
      More debugging · 69bce9c6
      unknown authored
      Print position in normal log for Binlog dump
      
      
      dbug/dbug.c:
        Added DBUG_OUTPUT() to temporary start/stop trace-file output
        Optimized alignment of CODE_STATE structure
      include/my_dbug.h:
        Added DBUG_OUTPUT() to temporary start/stop trace-file output
      sql/field.cc:
        Safety fix when used with future 5.0 .frm tables
      sql/log.cc:
        More debugging
      sql/mysqld.cc:
        Fixed type
      sql/slave.cc:
        Fixed wrong cast (not a bug)
      sql/sql_class.h:
        More DBUG output
      sql/sql_parse.cc:
        Print position in normal log for Binlog dump
      69bce9c6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · e862a42d
      unknown authored
      into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6031
      
      
      e862a42d
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · e4293968
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      e4293968
    • unknown's avatar
      added configure switch for ndb port number · b6ed85ba
      unknown authored
          added new variable for ndb port 1186
          changed meaning of ndb_port_base to be default tcp port setting
          changed to use split between port and port_base for ndbcluster
          so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
          added larger space to pid print
          moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
          added c-api to Ndb_mgmclient
          pass also ndb_port to make
      
      
      acinclude.m4:
        added configure switch for ndb port number
      configure.in:
        added new variable for ndb port 1186
        changed meaning of ndb_port_base to be default tcp port setting
      mysql-test/mysql-test-run.sh:
        changed to use split between port and port_base for ndbcluster
      mysql-test/ndb/Makefile.am:
        so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
      mysql-test/ndb/ndbcluster.sh:
        so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
      ndb/src/common/mgmcommon/LocalConfig.cpp:
        so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
      ndb/src/common/mgmcommon/Makefile.am:
        so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
      ndb/src/common/mgmcommon/NdbConfig.c:
        added larger space to pid print
      ndb/src/mgmclient/CommandInterpreter.cpp:
        moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
        added c-api to Ndb_mgmclient
      ndb/src/mgmclient/main.cpp:
        moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
      ndb/src/mgmclient/ndb_mgmclient.hpp:
        moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
      ndb/src/mgmsrv/ConfigInfo.cpp:
        moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
      ndb/src/mgmsrv/Makefile.am:
        pass also ndb_port to make
      b6ed85ba
    • unknown's avatar
      Bug#6031 - To drop database you have to execute DROP DATABASE command twice. · 97af0a0e
      unknown authored
        DROP DATABASE failed because of file ext not in TYPELIB of known extensions.
        General solution - construct a TYPELIB at runtime instead of a static list.
      
      
      mysql-test/r/ndb_basic.result:
        Bug#6031
          New test for bug
      mysql-test/t/ndb_basic.test:
        Bug#6031
          New test for bug
      sql/ha_ndbcluster.cc:
        Cosmetic fix
      sql/handler.cc:
        Bug#6031
          New function - ha_known_exts()
          We can construct TYPELIB of known db file extensions.
      sql/handler.h:
        Bug#6031
          New function - ha_known_exts()
      sql/sql_db.cc:
        Bug#6031
          We use a constructed list of known extensions instead of a static list
      97af0a0e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 977fef31
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      977fef31
    • unknown's avatar
      Adding new function prototype · 81880bab
      unknown authored
      81880bab
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 63ad234b
      unknown authored
      into mysql.com:/usr/home/bar/mysql-4.1
      
      
      63ad234b
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4b3a345b
      unknown authored
      into mysql.com:/usr/home/bar/mysql-4.1
      
      
      4b3a345b
    • unknown's avatar
      Merge mysql.com:/home/wax/mysql/mysql-4.1 · 53d6ae93
      unknown authored
      into mysql.com:/home/wax/mysql/mysql-4.1mysqltest
      
      
      53d6ae93
    • unknown's avatar
      1. When mixing NULL to a character string, · c5e6941e
      unknown authored
      the result takes its charset/collation
      attributes from the character string,
      e.g.  SELECT func(NULL, _latin2'string')
      now returns a latin2 result. This is
      done by introducing a new derivation
      (aka coercibility) level DERIVATION_IGNORABLE,
      which is used with Item_null.
      2. 'Pure' NULL is now BINARY(0), not CHAR(0).
      I.e. NULL is now more typeless.
      
      
      mysql-test/r/metadata.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/r/null.result:
        Testing mixing NULL with a character string with a number of functions.
      mysql-test/r/ps_2myisam.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/r/ps_3innodb.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/r/ps_4heap.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/r/ps_5merge.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/r/ps_6bdb.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/r/ps_7ndb.result:
        Fixing test results:
        CHAR(0) -> BINARY(0) for NULLs
      mysql-test/t/null.test:
        Testing mixing NULL with a character string with a number of functions.
      sql/item.cc:
        New derivation level.
      sql/item.h:
        New derivation level.
      c5e6941e
    • unknown's avatar
      replaced init_db.sql · 297abcb8
      unknown authored
      
      mysql-test/init_db.sql:
        replaced old init_db.sql on new one
      297abcb8
    • unknown's avatar
      bug#6538 · 7d09ee39
      unknown authored
      ndb: Fix return value in index_last wo/ rows
      
      
      sql/ha_ndbcluster.cc:
        Return correct when not finding any row from index_last
      7d09ee39
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · a12d6fd6
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      a12d6fd6
  3. 09 Nov, 2004 13 commits
  4. 08 Nov, 2004 2 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 6fd2435d
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      6fd2435d
    • unknown's avatar
      As rollback can be 30 times slower than insert in InnoDB, and user may · c4d04e9e
      unknown authored
      not know there's rollback (if it's because of a dupl row), better warn
      that it's happening. It can also be of use for a DBA killing a
      connection and wondering what this connection is still doing now. Example:
      |  5 | root | localhost | test | Killed  | 10   | Rolling back | insert into i select * from j |
      
      
      sql/handler.cc:
        As rollback can be 30 times slower than insert in InnoDB, and user may
        not know there's rollback (if it's because of a dupl row), better warn.
      c4d04e9e