1. 07 Jun, 2004 1 commit
    • unknown's avatar
      Last patch before push into main tree. Updated from code review and final once over. · 4e0b969b
      unknown authored
      A couple of small changes to ha_example (mainly comments). 
      
      
      sql/examples/ha_archive.cc:
        Changes from Serg.
        A few styles changes, fix for potential hash insert gone wrong, removed bad tables if create fails, gzflush used for flushing by default (had problems with OSX 10.2), and some spelling corrections.
      sql/examples/ha_archive.h:
        Removed fast_key_read() and changed the name of a conflicting variable.
      sql/examples/ha_example.cc:
        Added a few new comments.
      sql/examples/ha_example.h:
        Added pragma interface. Removed fast_key_read() and Serg's request
      4e0b969b
  2. 06 Jun, 2004 1 commit
  3. 05 Jun, 2004 3 commits
    • unknown's avatar
      mysql_stmt_field_count() · 0839550f
      unknown authored
      
      include/mysql.h:
        mysql_stmt_field_count() declaration
      libmysql/libmysql.c:
        added mysql_stmt_field_count(): 
        we need this function to ease use of mysql_stmt_result_metadata:
        if mysql_stmt_field_count() != 0 mysql_stmt_result_metadata fails
        only if OOM.
      libmysql/libmysql.def:
        declaration for mysql_stmt_field_count()
      0839550f
    • unknown's avatar
      More comments in prepared statements code. · af175193
      unknown authored
      
      libmysql/libmysql.c:
        Extended comments for mysql_stmt_init, mysql_stmt_prepare, 
        mysql_stmt_result_metadata.
        Few bits of code moved around and cleaned up.
      sql/sql_prepare.cc:
        Commented case with ulonglong length in get_param_length
      af175193
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 · 36631ba1
      unknown authored
      into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      acconfig.h:
        Auto merged
      acinclude.m4:
        Auto merged
      configure.in:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      36631ba1
  4. 04 Jun, 2004 6 commits
  5. 03 Jun, 2004 20 commits
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 8aabe7f8
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1
      
      
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      8aabe7f8
    • unknown's avatar
      Implementation of WL#1824 "Add replication of character set variables in 4.1", · e784947a
      unknown authored
      by binlogging some SET ONE_SHOT CHARACTER_SETetc,
      which will be enough until we have it more compact and more complete in 5.0. With the present patch,
      replication will work ok between 4.1.3 master and slaves, as long as:
      - master and slave have the same GLOBAL.COLLATION_SERVER
      - COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
      - application does not use the fact that table is created with charset of the USEd db (BUG#2326).
      all of which are not too hard to fulfill. 
      ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
      so we give error if used for non-charset vars.
      Fix for BUG#3875 "mysqlbinlog produces wrong ouput  if query uses
       variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
       properly after SET NAMES".
      Detecting that master and slave have different global charsets or server ids.
      
      
      mysql-test/r/rpl_server_id1.result:
        it's normal to not run as I have added a test to compare server ids of master and slave
        at startup and stop if equal (unless --replicate-same-server-id)
      mysql-test/r/rpl_user_variables.result:
        result update (as we now print charset of user var).
      mysql-test/r/user_var.result:
        result update
      mysql-test/t/rpl_server_id1.test:
        no need to select as slave is not running
      mysql-test/t/user_var.test:
        testing if the content of user vars is escaped when mysqlbinlog prints them,
        and if the name is backquoted.
      sql/lex.h:
        new keyword ONE_SHOT
      sql/log.cc:
        when writing to the binlog, before writing the actual statement, write some SET ONE_SHOT CHARACTER_SET_CLIENT etc
        for the slave to know the charset variables (which are important as they affect the inserted data).
      sql/log_event.cc:
        print charset and collation of user var in mysqlbinlog and SHOW BINLOG EVENTS.
        escape the content of the var. Backquote its name.
        Will ask Bar to check that using my_charset_bin for escaping is ok.
      sql/set_var.cc:
        understand SET CHARACTER_SET_CLIENT=10 (don't require a string, accept a number).
        Refuse changing of GLOBAL CHARACTER_SET_SERVER/COLLATION_SERVER if binlog or slave,
        as it will make the master or slave make wrong assumptions.
        A function to catch SET ONE_SHOT on non-charset variables (which is forbidden)
      sql/set_var.h:
        no_support_one_shot to know if the var supports ONE_SHOT (only charset vars do, soon timezones).
        Accept int arg in SET CHARACTER_SET_etc
      sql/slave.cc:
        when I/O slave thread starts, verify that master's and slave charsets match.
        And by the way verify that server ids are different.
        Don't fail if UNIX_TIMESTAMP() can't be done on master (very old master), that's
        not fatal.
      sql/sql_class.cc:
        one_shot
      sql/sql_class.h:
        one_shot
      sql/sql_lex.h:
        one_shot
      sql/sql_parse.cc:
        when SET ONE_SHOT is used, verify that it's only used for charset/collation vars;
        otherwise refuse.
      sql/sql_yacc.yy:
        ONE_SHOT keyword in SET
      e784947a
    • unknown's avatar
      Fix skipp -> skip once and for all. · 309dd278
      unknown authored
      (Note: This affects only comments, not variable names.)
      
      
      extra/perror.c:
        Fix skipp -> skip once and for all.
      heap/hp_hash.c:
        Fix skipp -> skip once and for all.
      isam/_dynrec.c:
        Fix skipp -> skip once and for all.
      isam/isamchk.c:
        Fix skipp -> skip once and for all.
      isam/isamlog.c:
        Fix skipp -> skip once and for all.
      isam/pack_isam.c:
        Fix skipp -> skip once and for all.
      isam/test1.c:
        Fix skipp -> skip once and for all.
      merge/mrg_open.c:
        Fix skipp -> skip once and for all.
      myisam/mi_check.c:
        Fix skipp -> skip once and for all.
      myisam/mi_delete.c:
        Fix skipp -> skip once and for all.
      myisam/mi_key.c:
        Fix skipp -> skip once and for all.
      myisam/mi_search.c:
        Fix skipp -> skip once and for all.
      myisam/myisamlog.c:
        Fix skipp -> skip once and for all.
      mysys/ChangeLog:
        Fix skipp -> skip once and for all.
      mysys/default.c:
        Fix skipp -> skip once and for all.
      mysys/mf_iocache.c:
        Fix skipp -> skip once and for all.
      mysys/mf_iocache2.c:
        Fix skipp -> skip once and for all.
      mysys/mf_pack.c:
        Fix skipp -> skip once and for all.
      mysys/mf_soundex.c:
        Fix skipp -> skip once and for all.
      mysys/mf_wfile.c:
        Fix skipp -> skip once and for all.
      mysys/my_error.c:
        Fix skipp -> skip once and for all.
      mysys/my_getwd.c:
        Fix skipp -> skip once and for all.
      scripts/mysql_find_rows.sh:
        Fix skipp -> skip once and for all.
      sql/sql_yacc.yy:
        Fix skipp -> skip once and for all.
      sql/time.cc:
        Fix skipp -> skip once and for all.
      strings/ctype-big5.c:
        Fix skipp -> skip once and for all.
      strings/ctype-gbk.c:
        Fix skipp -> skip once and for all.
      strings/ctype-tis620.c:
        Fix skipp -> skip once and for all.
      309dd278
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 49986732
      unknown authored
      into mc05.(none):/space2/tomas/mm
      
      49986732
    • unknown's avatar
      fil0fil.c: · c9ecde4c
      unknown authored
        Make allocation for file path more uniform: always use mem_alloc(), not ut_malloc()
      
      
      innobase/fil/fil0fil.c:
        Make allocation for file path more uniform: always use mem_alloc(), not ut_malloc()
      c9ecde4c
    • unknown's avatar
      os0file.c, fil0fil.c: · ac913659
      unknown authored
        Align file i/o buffers for DIRECT_IO; fix mem_alloc()/mem_free() crash bugs that came from Marko's latest cleanup
      
      
      innobase/fil/fil0fil.c:
        Align file i/o buffers for DIRECT_IO; fix mem_alloc()/mem_free() crash bugs that came from Marko's latest cleanup
      innobase/os/os0file.c:
        Align file i/o buffers for DIRECT_IO; fix mem_alloc()/mem_free() crash bugs that came from Marko's latest cleanup
      ac913659
    • unknown's avatar
      fixes for ndb and make distdir · 810555ad
      unknown authored
      810555ad
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3a875403
      unknown authored
      into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
      
      3a875403
    • unknown's avatar
      Unicode collations: WL#916 · c5f8d174
      unknown authored
      XML and "collation customization" language parsers.
      
      c5f8d174
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 06f230b2
      unknown authored
      into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
      
      06f230b2
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · cf02d830
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      cf02d830
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c4de7e48
      unknown authored
      into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
      
      
      configure.in:
        Auto merged
      c4de7e48
    • unknown's avatar
      Makefile.am: · 673c0676
      unknown authored
        local flag in ndbapi to set -O2 since problems occur with -O3
      pc.hpp, Emulator.hpp, Emulator.cpp, ErrorReporter.cpp:
        USE_EMULATED_JAM -> !NO_EMULATED_JAM
      ErrorReporter.hpp:
        removed NDEBUG and removed THREAD_ASSERT
      Dbdict.cpp:
        NDB_DEBUG -> VM_TRACE
      configure.in:
        cleaned up ndb CXX flags and added optional flag possibility
      
      
      configure.in:
        cleaned up ndb CXX flags and added optional flag possibility
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        NDB_DEBUG -> VM_TRACE
      ndb/src/kernel/error/ErrorReporter.cpp:
        USE_EMULATED_JAM -> !NO_EMULATED_JAM
      ndb/src/kernel/error/ErrorReporter.hpp:
        removed NDEBUG and removed THREAD_ASSERT
      ndb/src/kernel/vm/Emulator.cpp:
        USE_EMULATED_JAM -> !NO_EMULATED_JAM
      ndb/src/kernel/vm/Emulator.hpp:
        USE_EMULATED_JAM -> !NO_EMULATED_JAM
      ndb/src/kernel/vm/pc.hpp:
        USE_EMULATED_JAM -> !NO_EMULATED_JAM
      ndb/src/ndbapi/Makefile.am:
        local flag in ndbapi to set -O2 since problems occur with -O3
      673c0676
    • unknown's avatar
      More warnings in atrt · e1a4dfce
      unknown authored
      
      ndb/test/run-test/main.cpp:
        More warnings
      e1a4dfce
    • unknown's avatar
      Setup connect string · 149431ab
      unknown authored
      149431ab
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 17c0cfcc
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      17c0cfcc
    • unknown's avatar
      Fix for 840, invalid tuple size. · 18cc1ddc
      unknown authored
      Still don't know reason, but this works
      
      18cc1ddc
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 8c4513fa
      unknown authored
      into mc01.ndb.mysql.com:/space/mysql-4.1-ndb
      
      8c4513fa
    • unknown's avatar
      extern"C" bug · 02876737
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      02876737
    • unknown's avatar
      Fix for 3910 · 6651e07a
      unknown authored
      6651e07a
  6. 02 Jun, 2004 9 commits
    • unknown's avatar
      portability fix · 7d10bea2
      unknown authored
      7d10bea2
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 394ad320
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      394ad320
    • unknown's avatar
      Added authentication code that was missed in merge · d6db18e8
      unknown authored
      Added new windows configuration
      
      
      VC++Files/client/mysqlclient.dsp:
        Added new configuration
      VC++Files/zlib/zlib.dsp:
        Added new configuration
      libmysql/libmysql.c:
        Moved check function from libmysql.c to client.c
      sql-common/client.c:
        Moved check function from libmysql.c to client.c
      d6db18e8
    • unknown's avatar
      fil0fil.c: · 01e772b5
      unknown authored
        Fix typo spotted by Paul DuBois: 'no continue' -> 'not continue'
      
      
      innobase/fil/fil0fil.c:
        Fix typo spotted by Paul DuBois: 'no continue' -> 'not continue'
      01e772b5
    • unknown's avatar
      Merging · c4fc72e9
      unknown authored
      
      myisam/rt_index.c:
        Auto merged
      myisam/rt_index.h:
        Auto merged
      myisam/rt_mbr.c:
        Auto merged
      myisam/rt_mbr.h:
        Auto merged
      myisam/rt_split.c:
        Auto merged
      myisam/rt_test.c:
        Auto merged
      sql/spatial.cc:
        Auto merged
      c4fc72e9
    • unknown's avatar
      wl 1562 (To improve RTree indexes) · 7cafb309
      unknown authored
      some changes to make code nicer
      
      
      include/myisampack.h:
        mi_sint1korr and similar things added to do conversion in an
        uniform way
      myisam/rt_index.c:
        'if' simplified
      myisam/rt_mbr.c:
        some fixes to make code nicer and smaller
      myisam/rt_test.c:
        some modifications to extend test
      mysql-test/r/gis-rtree.result:
        result became slightly different because of changes made
      7cafb309
    • unknown's avatar
      Update atrt to use new names of binaries · 10428132
      unknown authored
      
      ndb/test/run-test/main.cpp:
        1) Updated names of binaries
        2) Use NDB_CONNECTSTRING
      10428132
    • unknown's avatar
      fixed naming error · cb13803d
      unknown authored
      cb13803d
    • unknown's avatar
      collapsed ndb start/stop scripts in mysql-test-run + ndb bin name changes · 9a0a301d
      unknown authored
      
      BitKeeper/deleted/.del-stop_ndbcluster.sh~b3b9e9505384aca1:
        Delete: mysql-test/ndb/stop_ndbcluster.sh
      mysql-test/mysql-test-run.sh:
        collapsed ndb start/stop scripts
      mysql-test/ndb/Makefile.am:
        collapsed ndb start/stop scripts
      mysql-test/ndb/ndbcluster.sh:
        collapsed ndb start/stop scripts + ndb bin name changes
      ndb/src/kernel/Makefile.am:
        ndb bin name changes
      ndb/src/kernel/blocks/backup/restore/Makefile.am:
        ndb bin name changes
      ndb/src/mgmclient/Makefile.am:
        ndb bin name changes
      ndb/src/mgmsrv/Makefile.am:
        ndb bin name changes
      ndb/tools/Makefile.am:
        ndb bin name changes
      9a0a301d