1. 20 Mar, 2003 3 commits
    • unknown's avatar
      fixed bad merge (s/rnd/my_rnd/) · 10096d91
      unknown authored
      10096d91
    • unknown's avatar
      Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 42879405
      unknown authored
      into mysql.com:/home/pem/work/mysql-4.1
      
      
      42879405
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 97cd4fb1
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.1
      
      
      configure.in:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      97cd4fb1
  2. 19 Mar, 2003 10 commits
    • unknown's avatar
      Merge with 4.0.12 · 161942e3
      unknown authored
      
      Docs/internals.texi:
        Auto merged
      include/my_global.h:
        Auto merged
      include/mysql_com.h:
        Auto merged
      innobase/row/row0mysql.c:
        Auto merged
      innobase/row/row0sel.c:
        Auto merged
      libmysql/Makefile.am:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      libmysqld/lib_vio.c:
        Auto merged
      mysql-test/r/heap.result:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/t/heap.test:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      BitKeeper/deleted/.del-password.c~76f30876e68eddb4:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/key.cc:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/slave.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      strings/strto.c:
        Auto merged
      161942e3
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 7517a59a
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.0
      
      
      7517a59a
    • unknown's avatar
      Print right hostname or IP in SHOW PROCESSLIST · 0847c4f9
      unknown authored
      Use SESSION TABLE_HANDLER as default table handler if given table handler doesn't exists
      
      
      Docs/internals.texi:
        Updated description for how DATE, TIME and TIMESTAMP are stored
      mysql-test/r/create.result:
        New tests
      mysql-test/t/create.test:
        New tests
      sql/handler.cc:
        Use SESSION TABLE_HANDLER as default table handler if given table handler doesn't exists.
      sql/sql_parse.cc:
        Fix that we return hostname instead of IP in SHOW PROCESSLIST
      sql/sql_show.cc:
        Print right hostname or IP in SHOW PROCESSLIST
      0847c4f9
    • unknown's avatar
      Added support for ULONG division with DIV · d7bedeb9
      unknown authored
      Fixed non fatal memory leak in slave code.
      
      
      mysql-test/r/func_test.result:
        Added test for DIV
      mysql-test/t/func_test.test:
        Added test for DIV
      mysys/my_alloc.c:
        More DBUG statements
      sql/item_func.cc:
        Added support for ULONG division with DIV
      sql/log_event.cc:
        Fixed memory leak (Wrong call to init_sql_alloc)
      sql/slave.cc:
        Fixed memory leak (Wrong call to init_sql_alloc)
      sql/sql_base.cc:
        More DBUG statements
      sql/sql_class.cc:
        Added init_for_queries() to fix memory leak in slave code
      sql/sql_class.h:
        Added init_for_queries() to fix memory leak in slave code
      sql/sql_error.cc:
        More DBUG statements
      sql/sql_parse.cc:
        Added init_for_queries() to fix memory leak in slave code
      sql/unireg.h:
        Moved memory defaults to include file
      d7bedeb9
    • unknown's avatar
      configure.in: · c2297fb5
      unknown authored
        Always compile utf8
      
      
      configure.in:
        Always compile utf8
      c2297fb5
    • unknown's avatar
      Strings comparison is now done according to "Collating sequences used for · 53c5d448
      unknown authored
      comparison" table, "SQL Complete, Really", page 162
      
      
      53c5d448
    • unknown's avatar
    • unknown's avatar
      Fixed a few typos, and translated new messages. · 2af67065
      unknown authored
      2af67065
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.0 · b4a0cdb8
      unknown authored
      into mysql.com:/space/my/mysql-4.0-build
      
      
      b4a0cdb8
    • unknown's avatar
      Getting closer to be more SQL99 in dyadic operations · 80630f12
      unknown authored
      
      mysql-test/r/ctype_collate.result:
        NO COLLATION has less coercibility than IMPLICIT and COERCIBLE
      sql/item.cc:
        Function to choose collation for dyadic operations
      sql/item.h:
        NO COLLATION has less coercibility than IMPLICIT and COERCIBLE
      sql/item_func.cc:
        Function to choose collation for dyadic operations
      sql/item_strfunc.cc:
        Function to choose collation for dyadic operations
      sql/item_strfunc.h:
        Use arg's attributes
      80630f12
  3. 18 Mar, 2003 16 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · cd4d7716
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.0
      
      
      configure.in:
        Auto merged
      cd4d7716
    • unknown's avatar
      Allow optimzation of multi-table-update also for InnoDB tables · f45236de
      unknown authored
      MEMORY is alias for HEAP for CREATE TABLE ... TYPE=HEAP
      Fixed bug in multi-table-update where a row could be updated several times
      
      
      mysql-test/r/heap.result:
        Test of CREATE TABLE ... type=MEMORY
      mysql-test/r/innodb.result:
        Added multi-update-test
      mysql-test/r/multi_update.result:
        Added multi-update-test
      mysql-test/t/heap.test:
        Test of CREATE TABLE ... type=MEMORY
      mysql-test/t/innodb.test:
        Added multi-update-test
      mysql-test/t/multi_update.test:
        Added multi-update-test
      sql/ha_innodb.h:
        Allow optimzation of multi-table-update also for InnoDB tables
      sql/handler.h:
        Allow optimzation of multi-update also for InnoDB tables
      sql/key.cc:
        After merge fix
      sql/lex.h:
        MEMORY is alias for HEAP
      sql/sql_test.cc:
        Fixed wrong printf
      sql/sql_update.cc:
        Fixed bug in multi-table-update where a row could be updated several times
      sql/sql_yacc.yy:
        MEMORY is alias for HEAP
      f45236de
    • unknown's avatar
      - renamed "rnd" to "my_rnd" as the name was too generic (and is an exported · f04be0b9
      unknown authored
         symbol in libmysqlclient) (thanks to Dennis Haney for the initial patch)
       - cleanup: removed client/password.c (not used at all) and
         libmysql/password.c (should rather be a symlink to sql/password.c instead)
       - applied HPUX11 portability fix for char_val declaration to sql/password.c
         (taken from libmysql/password.c)
      
      
      BitKeeper/deleted/.del-password.c~c036d4f8b3280843:
        Delete: client/password.c
      BitKeeper/deleted/.del-password.c~76f30876e68eddb4:
        Delete: libmysql/password.c
      include/mysql_com.h:
         - replaced "rnd" with "my_rnd"
      libmysql/Makefile.am:
         - removed dead piece of code ($qs was not defined)
         - symlink password.c from the sql directory
      libmysqld/Makefile.am:
         - use password.c from the sql directory instead
      sql/item_func.cc:
         - replaced "rnd" with "my_rnd"
      sql/mysqld.cc:
         - replaced "rnd" with "my_rnd"
      sql/password.c:
         - replaced "rnd" with "my_rnd"
      sql/sql_class.cc:
         - replaced "rnd" with "my_rnd"
      sql/sql_crypt.cc:
         - replaced "rnd" with "my_rnd"
      f04be0b9
    • unknown's avatar
      Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · 926a1194
      unknown authored
      into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
      
      
      926a1194
    • unknown's avatar
      Should use GeometryFromWKB(). · fe8ea234
      unknown authored
      fe8ea234
    • unknown's avatar
      CONVERT class was removed · 3f6a00d1
      unknown authored
      3f6a00d1
    • unknown's avatar
      SRID support. · 3ccd93c7
      unknown authored
      GeomertyFromWKB() function.
      SRID() function.
      ::store() methods for Field_geom.
      Code cleanup.
      
      
      myisam/sp_key.c:
        SRID support.
      mysql-test/r/gis.result:
        We should use GeometryFromWKB().
      mysql-test/t/gis.test:
        We should use GeometryFromWKB().
      sql/field.cc:
        SRID support.
        ::store() methods for Field_geom.
        Code cleanup.
      sql/field.h:
        SRID support.
        ::store() methods for Field_geom.
        Code cleanup.
      sql/item_cmpfunc.cc:
        SRID support.
        Code cleanup.
      sql/item_create.cc:
        Code cleanup.
      sql/item_create.h:
        Code cleanup.
      sql/item_func.cc:
        SRID support.
        Code cleanup.
      sql/item_func.h:
        SRID support.
      sql/item_strfunc.cc:
        SRID support.
        GeometryFromWKB() function.
        Code cleanup.
      sql/item_strfunc.h:
        SRID support.
        GeometryFromWKB() function.
        Code cleanup.
      sql/lex.h:
        GeometryFromWKB() function.
        SRID() function.
      sql/spatial.cc:
        Code cleanup.
      sql/spatial.h:
        Code cleanup.
      sql/sql_yacc.yy:
        Fix for xxxFromText() functions.
        GeometryFromWKB() function.
      3ccd93c7
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1c1f407d
      unknown authored
      into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp
      
      
      1c1f407d
    • unknown's avatar
      SHOW CREATE TABLE didn't display field names in the proper charset · 18d3292b
      unknown authored
      
      mysys/charset.c:
        Clear all fields at the end of previous charset
      18d3292b
    • unknown's avatar
      Fixes to avoid errors from valgrind · aa08887f
      unknown authored
      Fixed problem with 'wrong packet number' in union
      
      
      include/my_global.h:
        Fix for valgrind
      mysql-test/t/rpl_rotate_logs.test:
        Fix to avoid timeing problem
      sql/item.h:
        Indentation change
      sql/set_var.cc:
        Fix to avoid reference to uninitialized memory
      sql/sql_select.cc:
        More DBUG_PRINT messages
        Fixed problem with 'wrong packet number' in union (tmp_join.error was not correctly reset)
      sql/sql_union.cc:
        Simple code cleanup
      strings/ctype-simple.c:
        Fix for valgrind
      aa08887f
    • unknown's avatar
      - updated version number (4.0.12 -> 4.0.13) · 71aa1f6d
      unknown authored
       - tagged ChangeSet 1.1671 as mysql-4.0.12
      
      
      configure.in:
         - updated version number (4.0.12 -> 4.0.13)
      71aa1f6d
    • unknown's avatar
      Replication were broken because of automatic charset conversion. · 2dae38c7
      unknown authored
      As a fix, my_charset_bin is now used in master-slave packets instead
      of system_charset_info.
      
      
      2dae38c7
    • unknown's avatar
      sql_yacc.yy: · 1159272c
      unknown authored
        SET NAMES BINARY now works
      
      
      sql/sql_yacc.yy:
        SET NAMES BINARY now works
      1159272c
    • unknown's avatar
      Merge with 3.23 to get fix for halloween problem on Update of InnoDB tables · 21b0873a
      unknown authored
      
      innobase/row/row0mysql.c:
        Auto merged
      innobase/row/row0sel.c:
        Auto merged
      sql/key.cc:
        Auto merged
      configure.in:
        Merge with 3.23
      mysql-test/r/innodb.result:
        Merge with 3.23
      mysql-test/t/innodb.test:
        Merge with 3.23
      strings/strto.c:
        Merge with 3.23
      21b0873a
    • unknown's avatar
      Test of range optimizer in InnoDB · 53bb7b68
      unknown authored
      
      sql/ha_myisam.cc:
        Added function comment
      53bb7b68
    • unknown's avatar
      Fix of 'halloween bug' with UPDATE of InnoDB tables. · cf97cbd1
      unknown authored
      
      mysql-test/r/innodb.result:
        Test of 'halloween bug'
      mysql-test/t/innodb.test:
        Test of 'halloween bug'
      strings/strto.c:
        Portability fix
      cf97cbd1
  4. 17 Mar, 2003 11 commits
    • unknown's avatar
      New variable rli->ignore_log_space_limit to resolve · 40c0b2c6
      unknown authored
      a deadlock between I/O and SQL threads in replication
      when relay_log_space is too small. This fixes bug #79.
      
      
      sql/log.cc:
        New variable rli->ignore_log_space_limit to resolve
        a deadlock between I/O and SQL threads in replication
        when relay_log_space is too small.
      sql/slave.cc:
        New variable rli->ignore_log_space_limit to resolve
        a deadlock between I/O and SQL threads in replication
        when relay_log_space is too small.
      sql/slave.h:
        New variable rli->ignore_log_space_limit to resolve
        a deadlock between I/O and SQL threads in replication
        when relay_log_space is too small.
      sql/sql_repl.cc:
        New variable rli->ignore_log_space_limit to resolve
        a deadlock between I/O and SQL threads in replication
        when relay_log_space is too small.
      40c0b2c6
    • unknown's avatar
      ctype_many.result: · 89fee820
      unknown authored
        new file
      
        As far as bk could not apply delta,
        I removed it.  Now I'm adding the
        new version into the tree again.
      
      
      89fee820
    • unknown's avatar
      .del-ctype_many.result~9b541c4def2b5afb: · ac454723
      unknown authored
        Delete: mysql-test/r/ctype_many.result
      
        I could not commit it, bk told it can't apply binary delta
        for textual file.
      
      
      BitKeeper/deleted/.del-ctype_many.result~9b541c4def2b5afb:
        Delete: mysql-test/r/ctype_many.result
      ac454723
    • unknown's avatar
      · 84f0e117
      unknown authored
      
      mysql-test/t/ctype_many.test:
        Automatic client-server charset recoding has been added
      mysys/charset.c:
        Automatic client-server charset recoding has been added
      sql/item.cc:
        Automatic client-server charset recoding has been added
      sql/item.h:
        Automatic client-server charset recoding has been added
      sql/item_cmpfunc.cc:
        Automatic client-server charset recoding has been added
      sql/item_func.cc:
        Automatic client-server charset recoding has been added
      sql/item_strfunc.cc:
        Automatic client-server charset recoding has been added
      sql/mysqld.cc:
        Automatic client-server charset recoding has been added
      sql/protocol.cc:
        Automatic client-server charset recoding has been added
      sql/sql_string.cc:
        Automatic client-server charset recoding has been added
      sql/sql_yacc.yy:
        Automatic client-server charset recoding has been added
      strings/ctype-utf8.c:
        Automatic client-server charset recoding has been added
      84f0e117
    • unknown's avatar
      ctype_collate.result: · 3ca97c63
      unknown authored
        Automatic client-server charset recoding has been added
      
      
      mysql-test/r/ctype_collate.result:
        Automatic client-server charset recoding has been added
      3ca97c63
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 21034796
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.0
      
      
      21034796
    • unknown's avatar
      Change dbug.h -> my_dbug.h (Portability fix) · b1a78e2a
      unknown authored
      Ensure that \ is not allowed in filenames, even on Unix
      
      
      include/my_dbug.h:
        Rename: include/dbug.h -> include/my_dbug.h
      include/Makefile.am:
        Change dbug.h -> my_dbug.h
      include/my_global.h:
        Change dbug.h -> my_dbug.h
      libmysql/get_password.c:
        Change dbug.h -> my_dbug.h
      libmysqld/lib_vio.c:
        Change dbug.h -> my_dbug.h
      sql/table.cc:
        Ensure that \ is not allowed in filenames, even on Unix
      b1a78e2a
    • unknown's avatar
      Fixed a bug in --one-database. · 440cb76f
      unknown authored
      440cb76f
    • unknown's avatar
      sql_show.cc: · d2387b1a
      unknown authored
        Bug fix
        0 stayed for length here, now it is charset.
      
      
      sql/sql_show.cc:
        Bug fix
      d2387b1a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 8cb27d2f
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.1
      
      
      sql/field.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      8cb27d2f
    • unknown's avatar
      After merge fixes · b0b315dc
      unknown authored
      Don't create temporary objects with no table name
      
      
      myisam/mi_open.c:
        After merge fix
      mysql-test/r/analyse.result:
        After merge fix
      mysql-test/r/backup.result:
        After merge fix
      mysql-test/r/create.result:
        After merge fix
      mysql-test/r/delete.result:
        After merge fix
      mysql-test/r/func_like.result:
        After merge fix
      mysql-test/r/innodb.result:
        After merge fix
      mysql-test/r/rpl_loaddatalocal.result:
        After merge fix
      mysql-test/r/type_timestamp.result:
        After merge fix
      mysql-test/t/delete.test:
        Change to not use table 't'
      sql/sql_class.h:
        Remove usage of thd when creating 'Table_ident'
        Don't create temporary objects with no table name
      sql/sql_derived.cc:
        Indentation fix
      sql/sql_select.cc:
        After merge fix
        Fixed wrong return -> DBUG_RETURN()
      sql/sql_yacc.yy:
        Remove usage of thd when creating 'Table_ident'
      b0b315dc