1. 02 Jan, 2004 1 commit
    • unknown's avatar
      log0recv.h, log0recv.c: · 14a49377
      unknown authored
        Merge a log replay change required by ibbackup
      
      
      innobase/log/log0recv.c:
        Merge a log replay change required by ibbackup
      innobase/include/log0recv.h:
        Merge a log replay change required by ibbackup
      14a49377
  2. 31 Dec, 2003 2 commits
    • unknown's avatar
      row0purge.c: · 8f0dd34b
      unknown authored
        Fix bug: if purge of a table was not possible because its .ibd file was missing, trx->dict_operation_lock_mode was left to a wrong value, causing an assertion failure
      
      
      innobase/row/row0purge.c:
        Fix bug: if purge of a table was not possible because its .ibd file was missing, trx->dict_operation_lock_mode was left to a wrong value, causing an assertion failure
      8f0dd34b
    • unknown's avatar
      5e34724a
  3. 30 Dec, 2003 1 commit
  4. 29 Dec, 2003 2 commits
    • unknown's avatar
      latin1.xml, Index.xml: · 5d7b8979
      unknown authored
        Modern Spanish collation
      
      
      sql/share/charsets/Index.xml:
        Modern Spanish collation
      sql/share/charsets/latin1.xml:
        Modern Spanish collation
      5d7b8979
    • unknown's avatar
      logging_ok: · 5a12bea5
      unknown authored
        Logging to logging@openlogging.org accepted
      item_strfunc.cc:
        Bug wich appeared in ctype_tis620 is fixed
      
      
      sql/item_strfunc.cc:
        Bug wich appeared in ctype_tis620 is fixed
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      5a12bea5
  5. 25 Dec, 2003 4 commits
  6. 24 Dec, 2003 5 commits
    • unknown's avatar
      sql_parse.cc: · 5876c6c6
      unknown authored
        Fix for the bug 1175: Usernames will not converted to utf8 during connect
      
      
      sql/sql_parse.cc:
        Fix for the bug 1175: Usernames will not converted to utf8 during connect
      5876c6c6
    • unknown's avatar
      184e9cca
    • unknown's avatar
      charset.c: · 21996864
      unknown authored
        he mysqld server crashes if issued a command select convert(...)
        with a
        non-compiled character set:
      
      
      mysys/charset.c:
        he mysqld server crashes if issued a command select convert(...)
        with a
        non-compiled character set:
      21996864
    • unknown's avatar
      install_test_db.sh: · e3bcb46a
      unknown authored
        install-test-db did not substiture the path to charsets file, so tests failed with non-default collation incompiled, for example --with-collation=latin1_german1_ci
      mysqld.cc:
        better error messaging
      
      
      sql/mysqld.cc:
        better error messaging
      mysql-test/install_test_db.sh:
        install-test-db did not substiture the path to charsets file, so tests failed with non-default collation incompiled, for example --with-collation=latin1_german1_ci
      e3bcb46a
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · e46ff5d3
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.2046
      
      
      libmysqld/libmysqld.c:
        Auto merged
      e46ff5d3
  7. 23 Dec, 2003 6 commits
  8. 22 Dec, 2003 4 commits
  9. 21 Dec, 2003 6 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · 794575d6
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      794575d6
    • unknown's avatar
      typo fixed · 55aaa9ba
      unknown authored
      55aaa9ba
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 3093d714
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-root
      
      
      sql/sql_class.h:
        Auto merged
      3093d714
    • unknown's avatar
      THD::init_for_queries() pushed back: · 626663b1
      unknown authored
      see comments to the method why
      
      
      sql/sql_class.h:
        THD::init_for_queries() pushed back:
        see comments to the method why
        Cleanup
      626663b1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 49e83aaa
      unknown authored
      into mysql.com:/my/mysql-4.1
      
      49e83aaa
    • unknown's avatar
      Portability fixes found during 5.0 test compilation · c9a87dba
      unknown authored
      Fixed bug in ORDER BY on a small column (Bug #2147)
      Fixed error from pthread_mutex_destroy() when one had wrong errmsg file
      
      
      
      client/mysqltest.c:
        Added handling of error on query send
        (Needed for init_connection.test)
      mysql-test/mysql-test-run.sh:
        Added tracing of mysqldump and mysqlbinlog
      mysql-test/r/init_connect.result:
        Updated tests
      mysql-test/r/order_by.result:
        Added test for bug filesort bug
      mysql-test/t/init_connect-master.opt:
        Added proper quoting (for Solaris and OSF)
      mysql-test/t/init_connect.test:
        Portability fix
      mysql-test/t/order_by.test:
        Added test for bug #2147 (bug in filesort)
      sql/filesort.cc:
        Fixed bug in filesort (Bug #2147)
      sql/item.h:
        Clear 'fixed' on cleanup (For prepared statements)
      sql/item_func.cc:
        Protect mutex destroy.
        (Fixed error from pthread_mutex_destroy() when one had wrong errmsg file)
      sql/log_event.cc:
        Portability fix
      sql/sql_class.h:
        Fixed compiler warning
      sql/sql_prepare.cc:
        Portability fix. (Some compilers doesn't support jump over variables declared in for())
      c9a87dba
  10. 20 Dec, 2003 5 commits
    • unknown's avatar
      univ.i, srv0srv.c: · 7629fd37
      unknown authored
        Define macro ULINTPF which can be used in printf statements as the print format of ulint both on Win64 and other platforms
      
      
      innobase/srv/srv0srv.c:
        Define macro ULINTPF which can be used in printf statements as the print format of ulint both on Win64 and other platforms
      innobase/include/univ.i:
        Define macro ULINTPF which can be used in printf statements as the print format of ulint both on Win64 and other platforms
      7629fd37
    • unknown's avatar
      srv0start.c, univ.i, configure.in: · 6e558d61
      unknown authored
        Check at compilation time on Unix that InnoDB ulint is the same size as void*, and also check it at runtime
      
      
      innobase/configure.in:
        Check at compilation time on Unix that InnoDB ulint is the same size as void*, and also check it at runtime
      innobase/include/univ.i:
        Check at compilation time on Unix that InnoDB ulint is the same size as void*, and also check it at runtime
      innobase/srv/srv0start.c:
        Check at compilation time on Unix that InnoDB ulint is the same size as void*, and also check it at runtime
      6e558d61
    • unknown's avatar
      Merge fix · 6b16bae7
      unknown authored
      6b16bae7
    • unknown's avatar
      Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe · cddb39bc
      unknown authored
      A after merge fix for last merge
      
      
      innobase/btr/btr0btr.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/btr/btr0sea.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/buf/buf0buf.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/buf/buf0flu.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/buf/buf0lru.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/buf/buf0rea.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/com/com0shm.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/data/data0data.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/data/data0type.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/dict/dict0crea.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/dict/dict0dict.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/fil/fil0fil.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/fsp/fsp0fsp.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/fut/fut0lst.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/ha/ha0ha.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/ibuf/ibuf0ibuf.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/include/univ.i:
        Disabled ut_sprintf/ut_fprintf. Not needed as all number arguments to printf are now casted
      innobase/lock/lock0lock.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/log/log0log.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/log/log0recv.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/mem/mem0dbg.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/mem/mem0pool.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/mtr/mtr0log.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/mtr/mtr0mtr.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/os/os0file.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/os/os0sync.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/page/page0cur.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/page/page0page.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/read/read0read.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/rem/rem0cmp.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/rem/rem0rec.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/row/row0mysql.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
        Heikki, please check the change of % to %%
      innobase/row/row0sel.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/row/row0undo.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/srv/srv0srv.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/srv/srv0start.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/sync/sync0arr.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/sync/sync0rw.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/sync/sync0sync.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/trx/trx0purge.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/trx/trx0rec.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/trx/trx0roll.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/trx/trx0sys.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/trx/trx0trx.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/trx/trx0undo.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/usr/usr0sess.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/ut/ut0mem.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      innobase/ut/ut0ut.c:
        Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
      sql/sql_delete.cc:
        After merge fix
      cddb39bc
    • unknown's avatar
      one line was removed during merge · bf58eb6e
      unknown authored
      bf58eb6e
  11. 19 Dec, 2003 4 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 6a0484c9
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-prep_st_hack
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      6a0484c9
    • unknown's avatar
      Prepared_statement deployed instead of PREP_STMT. · 9c6eed72
      unknown authored
      
      libmysqld/lib_sql.cc:
        Prepared_statement now resides entirely in sql_prepare.cc
        Embedded versions of setup_params_data moved to sql_prepare.cc
      sql/mysql_priv.h:
        removed declarations for non-existing functions
      sql/slave.cc:
        no thd->init_for_queries() any more
      sql/sql_class.cc:
        added Statement and Statement_map classes.
        PREP_STMT replaced with Statement (Prepared_statement) and moved to
        sql_prepare.cc
      sql/sql_class.h:
        added Statement and Statement_map classes.
        PREP_STMT replaced with Statement (Prepared_statement) and moved to
        sql_prepare.cc
      sql/sql_parse.cc:
        thd->init_for_queries() doesn't exist any more
        comment moved to proper place
      sql/sql_prepare.cc:
        PREP_STMT replaced with Prepared_statement
        minor code cleanups
      tests/client_test.c:
        Later in the test we rely on order of rows, which normally is not defined.
        My patch changes the order.
      9c6eed72
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · af4713e5
      unknown authored
      into teton.kitebird.com:/home/paul/mysql-4.1
      
      af4713e5
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · a6fad3f7
      unknown authored
      into mysql.com:/my/mysql-4.1
      
      a6fad3f7