1. 16 Jan, 2003 5 commits
    • unknown's avatar
      4bd6c356
    • unknown's avatar
      field.cc: · df1a1075
      unknown authored
        strnxfrm for binary and simple charsets
      
      
      sql/field.cc:
        strnxfrm for binary and simple charsets
      df1a1075
    • unknown's avatar
      80d25174
    • unknown's avatar
      Added --compatible mode to mysqldump. · 3604aa00
      unknown authored
      
      client/mysqldump.c:
        Added --compatible mode to mysqldump. This mode can take the following
        values: mysql323,mysql40,postgresql,oracle,mssql,db2,sapdb,no_key_options,
        no_table_options,no_field_options.
        
        The table definition (SHOW CREATE TABLE name) will be compatible with
        the given mode.
      mysql-test/r/sql_mode.result:
        Fixed a bug in sql_show.cc, which affected the result.
      sql/sql_show.cc:
        Fixed a bug.
      3604aa00
    • unknown's avatar
      Added support sql_mode, which can be used to produce various outputs · d08e02eb
      unknown authored
      of SHOW CREATE TABLE 'name'. Depending on the mode, the output can
      be compatible with various databases, including earlier versions of
      MySQL
      .
      
      
      sql/field.cc:
        Added support for sql_mode.
        
        Changed find_set() to be aware of possible error. If the argument
        contains a value that is not legal in the set, err_pos and err_len
        are set.
      sql/field.h:
        Added support for sql_mode.
        
        Changed find_set() to be aware of possible error. If the argument
        contains a value that is not legal in the set, err_pos and err_len
        are set.
      sql/item_func.cc:
        Added support for sql_mode.
      sql/mysql_priv.h:
        Some new sql modes.
      sql/mysqld.cc:
        Added support for sql mode, including some new modes.
      sql/set_var.cc:
        Added support for sql_mode.
        
        Added function that can be used to check values in a set.
      sql/set_var.h:
        Added support for sql_mode.
        
        Added function that can be used to check values in a set.
      sql/sql_class.cc:
        Removed previous usage of opt_sql_mode.
      sql/sql_class.h:
        Removed previous usage of opt_sql_mode.
      sql/sql_lex.cc:
        Changed previous version of sql_mode to the new noe.
      sql/sql_parse.cc:
        Changed previous version of sql_mode to the new noe.
      sql/sql_select.cc:
        Changed previous version of sql_mode to the new noe.
      sql/sql_show.cc:
        Added support for various sql_modes for printing CREATE TABLE.
      sql/sql_yacc.yy:
        Changed previous version of sql_mode to the new noe.
      d08e02eb
  2. 15 Jan, 2003 1 commit
  3. 14 Jan, 2003 7 commits
    • unknown's avatar
      Merge abelkin@work.mysql.com:/home/bk/mysql-4.1 · 2d6f1c22
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/mysql-4.1
      
      
      2d6f1c22
    • unknown's avatar
      after merging fixing · 742de8f5
      unknown authored
      
      include/m_string.h:
        added include to va_list bicame known
      mysql-test/r/union.result:
        some changing in error message
      sql/sql_base.cc:
        error detection moved
      sql/sql_lex.cc:
        new flag to detect table name error
      sql/sql_lex.h:
        new flag to detect table name error
      sql/sql_yacc.yy:
        check possibility of using table name added
      742de8f5
    • unknown's avatar
      bin chatset now handles strnncoll itself so we don't have to check · 5ce47583
      unknown authored
      if charset is binary anymore
      
      
      5ce47583
    • unknown's avatar
      merge · 8b255948
      unknown authored
      
      BitKeeper/etc/ignore:
        added extra/mysql_waitpid
      include/m_ctype.h:
        Auto merged
      libmysql/Makefile.shared:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      8b255948
    • unknown's avatar
      Updates for multi-byte character sets · 910c125b
      unknown authored
      (Note: test 'union' fails, but Sanja promised to fix this)
      
      
      include/m_ctype.h:
        Changed prototype for strntod() to inform the user that source may be modified.
      include/m_string.h:
        Moved my_vsnprintf to strings library
      include/my_sys.h:
        Moved my_vsnprintf to strings library
      libmysql/Makefile.shared:
        Moved my_vsnprintf to strings library
      mysql-test/r/alter_table.result:
        Moved my_vsnprintf to strings library
      mysql-test/r/create.result:
        Moved my_vsnprintf to strings library
      mysql-test/r/ctype_many.result:
        Moved my_vsnprintf to strings library
      mysql-test/r/fulltext.result:
        Moved my_vsnprintf to strings library
      mysql-test/r/innodb.result:
        Moved my_vsnprintf to strings library
      mysql-test/r/merge.result:
        Moved my_vsnprintf to strings library
      mysql-test/r/select.result:
        Moved my_vsnprintf to strings library
      mysql-test/r/show_check.result:
        Moved my_vsnprintf to strings library
      mysql-test/r/type_blob.result:
        Moved my_vsnprintf to strings library
      mysql-test/r/type_enum.result:
        Moved my_vsnprintf to strings library
      mysql-test/r/type_ranges.result:
        Moved my_vsnprintf to strings library
      mysql-test/r/type_set.result:
        Moved my_vsnprintf to strings library
      mysys/Makefile.am:
        Moved my_vsnprintf to strings library
      sql/field.cc:
        Fixed for character set handling
      sql/field.h:
        Fixed for character set handling
      sql/item.cc:
        Fixed for character set handling
      sql/item.h:
        Fixed for character set handling
      sql/item_func.cc:
        Fixed for character set handling
      sql/item_func.h:
        Fixed for character set handling
      sql/item_strfunc.cc:
        Fixed for character set handling
      sql/item_sum.cc:
        Fixed for character set handling
      sql/item_sum.h:
        Fixed for character set handling
      sql/item_timefunc.cc:
        Fixed for character set handling
      sql/mysqld.cc:
        Update to use new test_if_int()
      sql/opt_range.cc:
        Fixed for character set handling
      sql/procedure.h:
        Fixed for character set handling
      sql/sql_class.cc:
        Fixed for character set handling
      sql/sql_string.cc:
        Added multi byte support to append.
        Added set_latin1()
      sql/sql_string.h:
        Added set_latin1()
      sql/sql_update.cc:
        Cosmetic changes
      strings/Makefile.am:
        Moved my_vsnprintf to strings library
      strings/ctype-simple.c:
        Code review + cleanup
      strings/ctype-utf8.c:
        Fixed strntod()
      strings/my_vsnprintf.c:
        Added support for %#d and %#u
      910c125b
    • unknown's avatar
      50989ef2
    • unknown's avatar
      Some reorganization to move loading related code to /strings library. · 5e88e699
      unknown authored
      This is to reuse code in conf_to_src.c
      
      
      5e88e699
  4. 13 Jan, 2003 3 commits
    • unknown's avatar
      ha_innodb.cc: · aef4ae16
      unknown authored
        Added some assertions to make sure index_init is only called with a properly prepared InnoDB table handle
      
      
      sql/ha_innodb.cc:
        Added some assertions to make sure index_init is only called with a properly prepared InnoDB table handle
      aef4ae16
    • unknown's avatar
      sql_handler.cc: · 2b174c6d
      unknown authored
        Fix InnoDB HANDLER: InnoDB must know in each call that the handle is used by HANDLER; the previous implementation worked only by pure luck
      
      
      sql/sql_handler.cc:
        Fix InnoDB HANDLER: InnoDB must know in each call that the handle is used by HANDLER; the previous implementation worked only by pure luck
      2b174c6d
    • unknown's avatar
      Fix for spatial objects · d2503a04
      unknown authored
      d2503a04
  5. 12 Jan, 2003 1 commit
    • unknown's avatar
      ut0mem.c, row0sel.c, row0mysql.c, ut0mem.h, row0sel.h, row0mysql.h: · b82f3bbe
      unknown authored
        Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
      ha_innodb.cc:
        Do not fetch all columns if change_active_index() is called during a query; a sum(a), max(a) query seemed to do that, doing unnecessary copying (the change actually made in the previous bk ci)
        Free BLOB heap of handle when MySQL calls some ::extra()'s
      
      
      sql/ha_innodb.cc:
        Do not fetch all columns if change_active_index() is called during a query; a sum(a), max(a) query seemed to do that, doing unnecessary copying (the change actually made in the previous bk ci)
      innobase/include/row0mysql.h:
        Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
      innobase/include/row0sel.h:
        Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
      innobase/include/ut0mem.h:
        Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
      innobase/row/row0mysql.c:
        Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
      innobase/row/row0sel.c:
        Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
      innobase/ut/ut0mem.c:
        Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
      b82f3bbe
  6. 11 Jan, 2003 1 commit
  7. 10 Jan, 2003 8 commits
  8. 09 Jan, 2003 13 commits
    • unknown's avatar
      Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 · 91f18f0a
      unknown authored
      
      innobase/mem/mem0pool.c:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      91f18f0a
    • unknown's avatar
      Post merge fix · f7ff1cca
      unknown authored
      Allow empty key list in USE|IGNORE|FORCE INDEX()
      
      
      mysql-test/r/myisam.result:
        New explain format
      mysql-test/t/myisam.test:
        test of index()
      mysys/my_handler.c:
        Updated ha_key_cmp() to be as latest _mi_key_cmp() in 4.0
      sql/sql_lex.cc:
        Post merge fix
      sql/sql_lex.h:
        Post merge fix
      sql/sql_parse.cc:
        Post merge fix
      sql/sql_yacc.yy:
        Post merge fix for FORCE INDEX ()
        Allow empty key list in USE|IGNORE|FORCE INDEX()
      f7ff1cca
    • unknown's avatar
      Merge work.mysql.com:/home/bk/mysql-4.1 · 0d520670
      unknown authored
      into myvenu.com:/home/venu/bk/src-4.1
      
      
      mysql-test/r/create.result:
        Auto merged
      0d520670
    • unknown's avatar
      .del-koi8_u.xml~ec104975f7e009bf: · ac2aea8c
      unknown authored
        Delete: sql/share/charsets/koi8_u.xml
      .del-koi8_r.xml~f95ebf1fb19f94cf:
        Delete: sql/share/charsets/koi8_r.xml
      
      
      BitKeeper/deleted/.del-koi8_r.xml~f95ebf1fb19f94cf:
        Delete: sql/share/charsets/koi8_r.xml
      BitKeeper/deleted/.del-koi8_u.xml~ec104975f7e009bf:
        Delete: sql/share/charsets/koi8_u.xml
      ac2aea8c
    • unknown's avatar
      euc_kr, koi8_r and koi8_u have been renamed so that now · 49fc3a76
      unknown authored
      all charset names don't have "_" sign.
      
      
      49fc3a76
    • unknown's avatar
      koi8u.xml, koi8r.xml: · 90bf0f97
      unknown authored
        new file
      
      
      90bf0f97
    • unknown's avatar
      5a5c618e
    • unknown's avatar
      Separating CHARSET and COLLATION terms · 6383a27b
      unknown authored
      
      mysql-test/r/alter_table.result:
        SHOW FIELDS and SHOW CREATE TABLE now displays collation
      mysql-test/r/create.result:
        SHOW FIELDS and SHOW CREATE TABLE now displays collation
      mysql-test/r/innodb.result:
        SHOW FIELDS and SHOW CREATE TABLE now displays collation
      mysql-test/r/isam.result:
        SHOW FIELDS and SHOW CREATE TABLE now displays collation
      mysql-test/r/select.result:
        SHOW FIELDS and SHOW CREATE TABLE now displays collation
      mysql-test/r/show_check.result:
        SHOW FIELDS and SHOW CREATE TABLE now displays collation
      mysql-test/r/type_blob.result:
        SHOW FIELDS and SHOW CREATE TABLE now displays collation
      mysql-test/r/type_float.result:
        SHOW FIELDS and SHOW CREATE TABLE now displays collation
      mysql-test/r/type_ranges.result:
        SHOW FIELDS and SHOW CREATE TABLE now displays collation
      sql/field.cc:
        In field type charset rather than collation name is displayed
      sql/sql_db.cc:
        COLLATE clause has been added into SHOW CREATE DATABASE
      sql/sql_lex.cc:
        Detect charset names rather than collation names
      sql/sql_show.cc:
        COLLATION field has been added into SHOW FIELDS
      sql/sql_yacc.yy:
        COLLATE syntax has been added in CREATE TABLE/DATABASE
      6383a27b
    • unknown's avatar
      fixed order_by test to make it repeatable · 6fb06a7a
      unknown authored
      6fb06a7a
    • unknown's avatar
      merge with 4.0.9 · 9d812016
      unknown authored
      To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys
      
      
      client/mysqladmin.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      extra/Makefile.am:
        Auto merged
      include/my_base.h:
        Auto merged
      innobase/log/log0log.c:
        Auto merged
      myisam/ft_nlq_search.c:
        Auto merged
      myisam/mi_open.c:
        Auto merged
      myisam/myisamdef.h:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql-bench/crash-me.sh:
        Auto merged
      sql-bench/test-insert.sh:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/table.h:
        Auto merged
      configure.in:
        merge with 4.0.9
      innobase/btr/btr0pcur.c:
        merge with 4.0.9
      myisam/mi_check.c:
        merge with 4.0.9
      myisam/mi_search.c:
        merge with 4.0.9
      mysql-test/t/myisam.test:
        merge with 4.0.9
      sql/log_event.cc:
        merge with 4.0.9
      sql/mysql_priv.h:
        merge with 4.0.9
      sql/sql_lex.h:
        merge with 4.0.9
      sql/sql_parse.cc:
        merge with 4.0.9
      sql/sql_yacc.yy:
        merge with 4.0.9
      9d812016
    • unknown's avatar
      Add TYPE as an alias for specifying key type · cd2f741d
      unknown authored
      cd2f741d
    • unknown's avatar
    • unknown's avatar
      Don't count NULL values in cardinalty for MyISAM tables. · b5e37b24
      unknown authored
      Free row buffer cache after each query for MyISAM tables.
      Added table join option FORCE INDEX
      Fixed core dump bug when connecting with hostname that could not be resolved.
      
      
      include/my_base.h:
        Don't count NULL values in cardinalty
      myisam/mi_check.c:
        Don't count NULL values in cardinalty
      myisam/mi_extra.c:
        Free row buffer cache after each query
      myisam/mi_open.c:
        Avoid realloc if cache size doesn't change
      myisam/mi_search.c:
        Don't count NULL values in cardinalty
      myisam/myisamdef.h:
        Change buffer length from uint to uint32 to make it more portable/predictable
      mysql-test/r/myisam.result:
        Test case for cardinality with NULL keys and FORCE INDEX
      mysql-test/t/myisam.test:
        Test case for cardinality with NULL keys and FORCE INDEX
      sql/lex.h:
        Added table join option FORCE INDEX
      sql/mysql_priv.h:
        Added table join option FORCE INDEX
      sql/opt_range.cc:
        Added table join option FORCE INDEX
      sql/sql_base.cc:
        Added table join option FORCE INDEX
      sql/sql_lex.h:
        Added table join option FORCE INDEX
      sql/sql_parse.cc:
        Added table join option FORCE INDEX
        Don't use strlen() on hostname without first checking if it's not NULL
      sql/sql_select.cc:
        Added table join option FORCE INDEX
      sql/sql_yacc.yy:
        Added table join option FORCE INDEX
      sql/table.h:
        Added table join option FORCE INDEX
      b5e37b24
  9. 08 Jan, 2003 1 commit
    • unknown's avatar
      buf0buf.c: · aef11cc9
      unknown authored
        Add a sanity check awe mem >= buf pool size
      
      
      innobase/buf/buf0buf.c:
        Add a sanity check awe mem >= buf pool size
      aef11cc9