1. 20 Jun, 2002 2 commits
  2. 19 Jun, 2002 5 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 78c4d839
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/work-select_lex-4.1
      
      
      sql/sql_yacc.yy:
        Auto merged
      78c4d839
    • unknown's avatar
      Now it is possible to drop default charset from table: · 83dfb9f8
      unknown authored
      ALTER TABLE a CHARSET=DEFAULT
      
      
      83dfb9f8
    • unknown's avatar
      Default table character set has been added: · e38f8e8c
      unknown authored
      CREATE TABLE a (field,...) TYPE=type CHARSET=cset;
      
      
      sql/handler.h:
        New flag to remember whether new table default charset 
        has been passed in ALTER TABLE
      sql/lex.h:
        New language symbol
      sql/sql_show.cc:
        Display default table charset if exists
      sql/sql_table.cc:
        Check table charset before default server charset
      sql/sql_yacc.yy:
        New create table option: default table character set
      sql/table.cc:
        Table charset
      sql/unireg.cc:
        field->charset must be initialized before. So assumes it is not NULL
      e38f8e8c
    • unknown's avatar
      merged · 6e04a0c8
      unknown authored
      
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      6e04a0c8
    • unknown's avatar
      EXISTS type of subselect · c6a2ae17
      unknown authored
      more correct parameters in result creation script
      
      
      mysql-test/create-test-result:
        more correct parameters in result creation script
      mysql-test/r/subselect.result:
        test of EXISTS
      mysql-test/t/subselect.test:
        test of EXISTS
      sql/item_subselect.cc:
        EXISTS type of subselect
      sql/item_subselect.h:
        EXISTS type of subselect
      sql/sql_class.cc:
        EXISTS type of subselect
      sql/sql_class.h:
        EXISTS type of subselect
      sql/sql_yacc.yy:
        EXISTS type of subselect
      c6a2ae17
  3. 17 Jun, 2002 2 commits
  4. 14 Jun, 2002 4 commits
    • unknown's avatar
      sql_prepare.cc: · e19b2382
      unknown authored
        corrected the symlink
      
      
      libmysqld/sql_prepare.cc:
        corrected the symlink
      e19b2382
    • unknown's avatar
      Makefile.am: · a40a485b
      unknown authored
        Added missing sql_prepare.cc & sql_error.cc to libmysqld
      sql_error.cc, sql_prepare.cc:
        new file
      
      
      libmysqld/Makefile.am:
        Added missing sql_prepare.cc & sql_error.cc to libmysqld
      a40a485b
    • unknown's avatar
      client_test.c: · 450006e6
      unknown authored
        Forgot to include the portable changes from previous commit
      
      
      tests/client_test.c:
        Forgot to include the portable changes from previous commit
      450006e6
    • unknown's avatar
      client_test.c: · 7fb7a8f2
      unknown authored
        new file
      
      'C' Test case for all prototype changes - Assert based which covers all most all scenarios
      
      
      7fb7a8f2
  5. 13 Jun, 2002 1 commit
    • unknown's avatar
      sql_list.h: · 1fac9fec
      unknown authored
        One more missed fix from Windows
      
      
      sql/sql_list.h:
        One more missed fix from Windows
      1fac9fec
  6. 12 Jun, 2002 3 commits
    • unknown's avatar
      mysql_priv.h: · 25a38bb9
      unknown authored
        Missed change from previous resolve
      
      
      sql/mysql_priv.h:
        Missed change from previous resolve
      25a38bb9
    • unknown's avatar
      sql_error.cc, sql_prepare.cc: · 6cdebb33
      unknown authored
        new file
      
        Client-server protocol 4.1 changes - Server side:
      
       * Enhanced metadata information:
          - SHOW [COUNT(*)] ERRORS [LIMIT [offset,] rows]
          - SHOW [COUNT(*)] WARNING [LIMIT [offset,] rows]
          - SHOW TABLE TYPES
          - SHOW PRIVILEGES
          - SHOW COLUMN TYPES (Not fully implemented)
      
       * Prepared execution
       * Long data handling in pieces
       * And other misc changes
      
      
      6cdebb33
    • unknown's avatar
      Client-Server Protocol 4.1 changes - Client side: · 049a8386
      unknown authored
        - Support of prepared execution
        - Support of Original Table and Column names
        - Support of direct transactional API
        - And lot of misc handling
      
        (Note that, the pull will not work, unless you have the Server side changes also which will be followed by this commit)
        
      
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      049a8386
  7. 11 Jun, 2002 2 commits
  8. 10 Jun, 2002 4 commits
  9. 07 Jun, 2002 6 commits
    • unknown's avatar
      .del-makefile2.w32: · 454712d2
      unknown authored
        Rename: BitKeeper/deleted/.del-makefile.w32 -> BitKeeper/deleted/.del-makefile2.w32
      
      
      BitKeeper/deleted/.del-makefile2.w32:
        Rename: BitKeeper/deleted/.del-makefile.w32 -> BitKeeper/deleted/.del-makefile2.w32
      454712d2
    • unknown's avatar
      temporary preventing subselect in HAVING clause · b0c1e004
      unknown authored
      b0c1e004
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · c06575e4
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/work-select_lex-4.1
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      c06575e4
    • unknown's avatar
      Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 · 016fe788
      unknown authored
      into gw.udmsearch.izhnet.ru:/usr/home/ram/mysql-4.1
      
      
      016fe788
    • unknown's avatar
      check_one_rb_key() func · 6d289303
      unknown authored
      6d289303
    • unknown's avatar
      Charset of any string field now can be specified during CREATE TABLE · 6c2dcd86
      unknown authored
      
      mysql-test/r/alter_table.result:
        Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
      mysql-test/r/create.result:
        Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
      mysql-test/r/fulltext.result:
        Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
      mysql-test/r/innodb.result:
        Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
      mysql-test/r/merge.result:
        Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
      mysql-test/r/select.result:
        Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
      mysql-test/r/show_check.result:
        Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
      mysql-test/r/symlink.result:
        Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
      mysql-test/r/type_blob.result:
        Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
      mysql-test/r/type_ranges.result:
        Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
      sql/field.cc:
        New format for string fields in SHOW CREATE TABLE and SHOW FIELDS
      sql/mysql_priv.h:
        pass charset
      sql/sql_parse.cc:
        QQ is now fixed :)
      sql/sql_yacc.yy:
        New format for string fields in SHOW CREATE TABLE and SHOW FIELDS
      6c2dcd86
  10. 06 Jun, 2002 1 commit
  11. 05 Jun, 2002 4 commits
    • unknown's avatar
      post-merged fixing · 4a1dec3d
      unknown authored
      4a1dec3d
    • unknown's avatar
      fixing after mergin · 05bb861b
      unknown authored
      05bb861b
    • unknown's avatar
      merged · 954a0583
      unknown authored
      
      sql/item.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      954a0583
    • unknown's avatar
      configure.in: · cb27688b
      unknown authored
        changed version number
      
      
      cb27688b
  12. 04 Jun, 2002 4 commits
    • unknown's avatar
      Merge work:/my/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1 · fa86b948
      unknown authored
      
      heap/hp_write.c:
        Auto merged
      include/my_tree.h:
        Auto merged
      mysys/charset.c:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      fa86b948
    • unknown's avatar
      Update results for new SHOW FULL COLUMNS · f45dc577
      unknown authored
      Portability fixes
      
      
      include/my_tree.h:
        Add missing include file.
      mysql-test/r/select.result:
        Update results for new SHOW FULL COLUMNS
      mysql-test/r/type_blob.result:
        Update results for new SHOW FULL COLUMNS
      mysql-test/r/type_float.result:
        Update results for new SHOW FULL COLUMNS
      mysql-test/r/type_ranges.result:
        Update results for new SHOW FULL COLUMNS
      mysql-test/t/heap_btree.test:
        Update results for new SHOW FULL COLUMNS
      f45dc577
    • unknown's avatar
      merge with 4.0 to get last fixes to last merge · daff6c51
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      Docs/manual.texi:
        Auto merged
      client/mysqltest.c:
        Auto merged
      mysql-test/r/alter_table.result:
        Auto merged
      mysql-test/r/func_math.result:
        Auto merged
      sql/hostname.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_analyse.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        merge with 4.0
      daff6c51
    • unknown's avatar
      Changes for new binary .frm format · 08526ba3
      unknown authored
      Fixes after last merge from 4.0.
      (Code not yet complete, need anoter merge from 4.0)
      
      
      heap/hp_write.c:
        cleanup
      myisam/ft_boolean_search.c:
        Fixed tree handling to new format
      mysql-test/r/alter_table.result:
        SHOW FULL COLUMN FROM TABLE now returns comment
      mysql-test/r/func_math.result:
        Updated results
      mysql-test/r/heap_btree.result:
        Portability fix
      mysql-test/r/isam.result:
        SHOW FULL COLUMN FROM TABLE now returns comment
      mysql-test/r/show_check.result:
        SHOW FULL COLUMN FROM TABLE now returns comment
      mysql-test/t/heap_btree.test:
        Portability fix
      mysql-test/t/show_check.test:
        SHOW FULL COLUMN FROM TABLE now returns comment
      sql/field.cc:
        Fix for comment handling
      sql/field.h:
        Added CHARSET_INFO to field structure
      sql/item_cmpfunc.cc:
        Fixed like to use system charset (need to be updated)
      sql/item_func.cc:
        Update to new charset handling
      sql/mysql_priv.h:
        cleanup
      sql/sql_base.cc:
        Added charset to HA_CREATE_INFO
      sql/sql_delete.cc:
        Added charset to HA_CREATE_INFO
      sql/sql_parse.cc:
        Added charset to HA_CREATE_INFO
      sql/sql_select.cc:
        cleanup
      sql/sql_show.cc:
        charset change
      sql/sql_string.h:
        cleanup
      sql/sql_table.cc:
        cleanup
      sql/sql_yacc.yy:
        Go back to old code for ALTER table ... MODIFY
      sql/table.cc:
        fixed comment handling
      sql/unireg.cc:
        new field format
      08526ba3
  13. 03 Jun, 2002 2 commits
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · ad4e6865
      unknown authored
      
      Docs/manual.texi:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      ad4e6865
    • unknown's avatar
      Enable LOAD DATA LOCAL INFILE in mysql_test · a7798dfd
      unknown authored
      Added syntax for column comments (for compability with 4.1)
      Fix of ALTER TABLE RENAME
      
      
      Docs/manual.texi:
        Changelog
      client/mysqltest.c:
        Enable LOAD DATA LOCAL INFILE
      mysql-test/r/alter_table.result:
        Test of syntax for column comments
      mysql-test/r/func_math.result:
        Fixed test of new truncate
      mysql-test/t/alter_table.test:
        Test of syntax for column comments
      mysys/my_gethostbyname.c:
        Portability fix
      sql/hostname.cc:
        Fixed pointer bug
      sql/item_cmpfunc.cc:
        Optimizing LIKE code
      sql/item_cmpfunc.h:
        Cleanup
      sql/mysqld.cc:
        Avoid warning of duplicate calls to mysql_thread_init()
      sql/sql_analyse.cc:
        Removed warning from DBUG
      sql/sql_parse.cc:
        Avoid warning of duplicate calls to mysql_thread_init()
      sql/sql_table.cc:
        Fix of ALTER TABLE RENAME
      sql/sql_yacc.yy:
        Added syntax for field comments
      vio/test-sslserver.c:
        Cleanup
      a7798dfd