1. 24 Nov, 2004 10 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 8b451b6a
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
      
      8b451b6a
    • unknown's avatar
      A fix. Why didn't we use UINT_MAX32? · 9a4cb312
      unknown authored
      9a4cb312
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · b927c63d
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/table.h:
        Auto merged
      b927c63d
    • unknown's avatar
      fixed problem in MacOS · 12ac3d30
      unknown authored
      correct printing of aliases
      
      
      mysql-test/r/lowercase_view.result:
        aliases in VIEWs
      mysql-test/t/lowercase_view.test:
        aliases in VIEWs
      sql/item.cc:
        tracking using aliases in indentifiers
      sql/item.h:
        tracking using aliases in indentifiers
      sql/sql_base.cc:
        tracking using aliases in indentifiers
      sql/sql_lex.cc:
        tracking using aliases in indentifiers
      sql/sql_lex.h:
        tracking using aliases in indentifiers
      sql/table.h:
        tracking using aliases in indentifiers
      12ac3d30
    • unknown's avatar
      Merge from 4.0 for immediate use in the current 5.0 builds. · 69d27cb0
      unknown authored
      
      client/mysqladmin.cc:
        Auto merged
      Build-tools/Do-compile:
        Merged the default "--force" for the call to 'mysql-test-run' from 4.0, for immediate use in the current 5.0 builds.
      69d27cb0
    • unknown's avatar
      Fixed bug related to lower case table names on Power Mac · 1987e3f4
      unknown authored
      'information_schema' test is splitted because of innodb  
      
      
      mysql-test/r/information_schema.result:
        Test is splitted because of innodb
      mysql-test/t/information_schema.test:
        Test is splitted because of innodb
      sql/sql_show.cc:
        Fixed bug related to lower case table names on Power Mac
      sql/table.h:
        Fixed bug related to lower case table names on Power Mac
      tests/client_test.c:
        Don't check field length for blob filed
      1987e3f4
    • unknown's avatar
      Ensure consistent sources up to 5.0 where a C++ problem occurs. · 89785675
      unknown authored
      
      client/mysqladmin.c:
        Cast to overcome a C vs. C++ signature problem, occurring in 5.0 where this is a C++ file.
      89785675
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 69d569ea
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-bg5888
      
      69d569ea
    • unknown's avatar
      A small cleanup in sql_select.h · 5050de0f
      unknown authored
      
      sql/sql_select.h:
        Remove double assingment of fields_list.
      5050de0f
    • unknown's avatar
      Fix for bug #5888 "Triggers with nonexistent columns cause packets · 245fa6cb
      unknown authored
      out of order". (final version)
      
      Now instead of binding Item_trigger_field to TABLE objects during
      trigger definition parsing at table open, we perform pass through
      special list of all such objects in trigger. This allows easily check
      all references to fields in old/new version of row in trigger during
      execution of CREATE TRIGGER statement (this is more courtesy for users
      since we can't check everything anyway).
      We also report that such reference is bad by returning error from
      Item_trigger_field::fix_fields() method (instead of setup_field())
      This means that if trigger is broken we will bark during trigger
      execution instead of trigger definition parsing at table open.
      (i.e. now we allow to open tables with broken triggers).
      
      
      mysql-test/r/trigger.result:
        Added test which attempts to create trigger for table referencing to
        field which does not exist in this table.
      mysql-test/t/trigger.test:
        Added test which attempts to create trigger for table referencing to
        field which does not exist in this table.
      sql/item.cc:
        Item_trigger_field::setup_field() now returns void. If any error
        will occur we will report it at fix_fields() stage.
      sql/item.h:
        Item_trigger_field:
        - Added next_trg_field member for linking all such objects in trigger
          in one list.
        - Also setup_field() now returns void. If any error will occur we will
          report it at fix_fields() stage.
      sql/mysql_priv.h:
        Added SQL_LIST::push_back() method which allows to add another SQL_LIST
        to the end of this SQL_LIST.
      sql/sp_head.cc:
        sp_head::init()/reset_lex()/restore_lex():
         In order to fill global LEX::trg_table_fields (list of all 
         Item_trigger_field objects for trigger) we should init the same list
         in LEX of substatement before its parsing and merge it to global list
         after parsing.
      sql/sp_head.h:
        sp_instr_trigger_field:
          Made trigger_field member public to be able to add it more easily to
          global list of all Item_trigger_field objects in trigger.
      sql/sql_lex.cc:
        LEX::trg_table was removed.
      sql/sql_lex.h:
        Now we are binding Item_trigger_field's to TABLE object by passing
        through specially constructed list of all such objects in this trigger
        instead of doing this during trigger definition parsing at table open.
        So we no longer need LEX::trg_table, we use LEX::trg_table_fields list
        instead.
      sql/sql_parse.cc:
        mysql_execute_command():
          Since now we use trigger body for some checks in
          mysql_create_or_drop_trigger() we should destroy it only
          after calling this function.
      sql/sql_trigger.cc:
        Now instead of binding Item_trigger_field to TABLE objects during
        trigger definition parsing at table open, we perform pass through
        special list of all such objects in trigger. This allows easily check
        all references to fields in old/new version of row in trigger during
        execution of CREATE TRIGGER statement (this is more courtesy for users
        since we can't check everything anyway).
        We also report that such reference is bad by returning error from
        Item_trigger_field::fix_fields() method (instead of setup_field())
        This means that if trigger is broken we will bark during trigger
        execution instead of trigger definition parsing at table open.
        (i.e. now we allow to open tables with broken triggers).
        
        Table_triggers_list::prepare_old_row_accessors() method was added to be
        able to reuse code creating Field objects referencing TABLE::record[1]
        buffer instead of TABLE::record[0].
      sql/sql_trigger.h:
        Added Table_triggers_list::prepare_old_row_accessors() method to be
        able to reuse code creating Field objects referencing to TABLE::record[1]
        instead of record[0].
      sql/sql_yacc.yy:
        Now instead of performing binding of Item_trigger_field objects
        to TABLE object during trigger definition parsing at table open,
        we perform this binding by passing through specially constructed
        list of all such items in trigger.
        We also check value returned from memory allocation functions.
      245fa6cb
  2. 23 Nov, 2004 17 commits
  3. 22 Nov, 2004 13 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · d7ed9470
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      sql/sql_table.cc:
        Auto merged
      d7ed9470
    • unknown's avatar
      post-merge · b1028d51
      unknown authored
      b1028d51
    • unknown's avatar
      merged · d3dfd871
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      Docs/Support/texi2html:
        Auto merged
      client/mysqltest.c:
        Auto merged
      innobase/lock/lock0lock.c:
        Auto merged
      innobase/row/row0sel.c:
        Auto merged
      mysql-test/r/fulltext.result:
        Auto merged
      mysql-test/r/heap.result:
        Auto merged
      mysql-test/r/key.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/r/rpl000015.result:
        Auto merged
      mysql-test/r/rpl_log_pos.result:
        Auto merged
      mysql-test/r/rpl_rotate_logs.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/type_blob.result:
        Auto merged
      mysql-test/t/key.test:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      mysql-test/t/rpl000015.test:
        Auto merged
      mysql-test/t/rpl_log_pos.test:
        Auto merged
      mysql-test/t/rpl_rotate_logs.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_do.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      d3dfd871
    • unknown's avatar
      typo fixed · 09b3b64e
      unknown authored
      09b3b64e
    • unknown's avatar
      merged · 977d17e0
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      Docs/Support/texi2html:
        Auto merged
      client/mysqltest.c:
        Auto merged
      myisam/ft_boolean_search.c:
        Auto merged
      mysql-test/r/fulltext.result:
        Auto merged
      mysql-test/r/rpl000015.result:
        Auto merged
      mysql-test/r/rpl_log_pos.result:
        Auto merged
      mysql-test/r/rpl_rotate_logs.result:
        Auto merged
      mysql-test/t/fulltext.test:
        Auto merged
      mysql-test/t/rpl000001.test:
        Auto merged
      mysql-test/t/rpl000015.test:
        Auto merged
      mysql-test/t/rpl_log_pos.test:
        Auto merged
      mysql-test/t/rpl_rotate_logs.test:
        Auto merged
      977d17e0
    • unknown's avatar
    • unknown's avatar
      Bug#6252 - Duplicate columns in keys should fail · 5eebb3c3
      unknown authored
        Added check for duplicate column in key
        Added tests and fixed tests which exploit bug
      
      
      mysql-test/r/delete.result:
        Fix test as it exploited Bug#6252
      mysql-test/r/innodb.result:
        Test for Bug#6126
      mysql-test/r/key.result:
        Test for Bug#6126/6252
      mysql-test/r/type_blob.result:
        Fix test as it exploited Bug#6252
      mysql-test/t/delete.test:
        Fix test as it exploited Bug#6252
      mysql-test/t/innodb.test:
        Test for Bug#6126
      mysql-test/t/key.test:
        Test for Bug#6126/6252
      mysql-test/t/type_blob.test:
        Fix test as it exploited Bug#6252
      sql/sql_table.cc:
        Bug#6252 - Duplicate columns in keys should fail
          Added check for duplicate column.
      5eebb3c3
    • unknown's avatar
      merged with ul · fabef3b5
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      Docs/Support/texi2html:
        Auto merged
      mysql-test/t/rpl000001.test:
        Auto merged
      mysql-test/t/rpl000015.test:
        Auto merged
      mysql-test/t/rpl_log_pos.test:
        Auto merged
      fabef3b5
    • unknown's avatar
      ndb: fix blob performance in long transactions · 77e59f29
      unknown authored
      
      ndb/include/ndbapi/NdbConnection.hpp:
        fix blob performance in long transactions
      ndb/src/ndbapi/NdbConnection.cpp:
        fix blob performance in long transactions
      ndb/test/ndbapi/testBlobs.cpp:
        fix blob performance in long transactions
      77e59f29
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0/ · 422f469b
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.0
      
      422f469b
    • unknown's avatar
      ft_boolean_search.c: · bf1ac7c7
      unknown authored
        bug#6705 - (+trunc1* +trunc2*)
      fulltext.test, fulltext.result:
        bug#6705
      
      
      mysql-test/r/fulltext.result:
        bug#6705
      mysql-test/t/fulltext.test:
        bug#6705
      myisam/ft_boolean_search.c:
        bug#6705 - (+trunc1* +trunc2*)
      bf1ac7c7
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · 6d0b5de6
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      6d0b5de6
    • unknown's avatar
      - renamed mysqladmin.c -> mysqladmin.cpp to fix the Windows builds · e73f0974
      unknown authored
      
      BitKeeper/etc/ignore:
        Added ac_available_languages_fragment to the ignore list
      e73f0974