1. 16 Jun, 2004 2 commits
  2. 11 Jun, 2004 1 commit
  3. 10 Jun, 2004 1 commit
    • unknown's avatar
      bug#3964 and related issues: FTB problems with charsets where one byte can match many · 1e24da54
      unknown authored
      correct prefix compare with my_strnncoll
      
      
      include/m_ctype.h:
        6th argument to my_strncoll to handle prefix comparison
      myisam/ft_boolean_search.c:
        bug#3964 and related issues: problems with charsets where one byte can match many
        *correct* prefix compare with my_strnncoll
        *correct* backup of info->lastkey
      mysql-test/r/fulltext.result:
        6th argument to my_strncoll to handle prefix comparison
      mysql-test/t/fulltext.test:
        6th argument to my_strncoll to handle prefix comparison
      mysys/my_handler.c:
        6th argument to my_strncoll to handle prefix comparison
      sql/sql_parse.cc:
        cleanup
      strings/ctype-big5.c:
        6th argument to my_strncoll to handle prefix comparison
      strings/ctype-bin.c:
        6th argument to my_strncoll to handle prefix comparison
      strings/ctype-czech.c:
        6th argument to my_strncoll to handle prefix comparison
      strings/ctype-gbk.c:
        6th argument to my_strncoll to handle prefix comparison
      strings/ctype-latin1.c:
        6th argument to my_strncoll to handle prefix comparison
      strings/ctype-mb.c:
        6th argument to my_strncoll to handle prefix comparison
      strings/ctype-simple.c:
        6th argument to my_strncoll to handle prefix comparison
      strings/ctype-sjis.c:
        6th argument to my_strncoll to handle prefix comparison
      strings/ctype-tis620.c:
        6th argument to my_strncoll to handle prefix comparison
      strings/ctype-uca.c:
        6th argument to my_strncoll to handle prefix comparison
      strings/ctype-ucs2.c:
        6th argument to my_strncoll to handle prefix comparison
      strings/ctype-utf8.c:
        6th argument to my_strncoll to handle prefix comparison
      strings/ctype-win1250ch.c:
        6th argument to my_strncoll to handle prefix comparison
      1e24da54
  4. 05 Jun, 2004 2 commits
  5. 04 Jun, 2004 6 commits
  6. 03 Jun, 2004 20 commits
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 948903fc
      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
      948903fc
    • unknown's avatar
      Implementation of WL#1824 "Add replication of character set variables in 4.1", · 934bb37d
      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
      934bb37d
    • unknown's avatar
      Fix skipp -> skip once and for all. · e6b4b304
      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.
      e6b4b304
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0f7a9f61
      unknown authored
      into mc05.(none):/space2/tomas/mm
      
      
      0f7a9f61
    • unknown's avatar
      fil0fil.c: · bf54e9f4
      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()
      bf54e9f4
    • unknown's avatar
      os0file.c, fil0fil.c: · bdabdb76
      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
      bdabdb76
    • unknown's avatar
      fixes for ndb and make distdir · 54d8f52c
      unknown authored
      54d8f52c
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3b2201c8
      unknown authored
      into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
      
      
      3b2201c8
    • unknown's avatar
      Unicode collations: WL#916 · 5a2b1ba6
      unknown authored
      XML and "collation customization" language parsers.
      
      
      5a2b1ba6
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 8dd79895
      unknown authored
      into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
      
      
      8dd79895
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 7159900e
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      7159900e
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · e99795cc
      unknown authored
      into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
      
      
      configure.in:
        Auto merged
      e99795cc
    • unknown's avatar
      Makefile.am: · 13047f45
      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
      13047f45
    • unknown's avatar
      More warnings in atrt · b558c415
      unknown authored
      
      ndb/test/run-test/main.cpp:
        More warnings
      b558c415
    • unknown's avatar
      Setup connect string · 34e5cca1
      unknown authored
      34e5cca1
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 80b27997
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      80b27997
    • unknown's avatar
      Fix for 840, invalid tuple size. · db858c08
      unknown authored
      Still don't know reason, but this works
      
      
      db858c08
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · d88fbdc3
      unknown authored
      into mc01.ndb.mysql.com:/space/mysql-4.1-ndb
      
      
      d88fbdc3
    • unknown's avatar
      extern"C" bug · e34db29d
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      e34db29d
    • unknown's avatar
      Fix for 3910 · 6868112c
      unknown authored
      6868112c
  7. 02 Jun, 2004 8 commits
    • unknown's avatar
      portability fix · 2a32bb2b
      unknown authored
      2a32bb2b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · b94356ae
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      b94356ae
    • unknown's avatar
      Added authentication code that was missed in merge · f112903c
      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
      f112903c
    • unknown's avatar
      fil0fil.c: · 284144f4
      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'
      284144f4
    • unknown's avatar
      Merging · d55cb81c
      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
      d55cb81c
    • unknown's avatar
      wl 1562 (To improve RTree indexes) · 21dea7fc
      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
      21dea7fc
    • unknown's avatar
      Update atrt to use new names of binaries · c2b5e645
      unknown authored
      
      ndb/test/run-test/main.cpp:
        1) Updated names of binaries
        2) Use NDB_CONNECTSTRING
      c2b5e645
    • unknown's avatar
      fixed naming error · 1c89ea1f
      unknown authored
      1c89ea1f