1. 22 Jun, 2005 2 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8fc03d97
      unknown authored
      into  moonbone.local:/work/mysql-5.0-bug-11298
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      mysql-test/r/view.result:
        SCCS merged
      mysql-test/t/view.test:
        SCCS merged
      8fc03d97
    • unknown's avatar
      Fix bug#11298 insert into select from VIEW produces incorrect result · 401fa3cb
      unknown authored
        when using ORDER BY
      
      Insert were inserting data from last record fetched instead of inserting from 
      temporary table.
      
      Make Item_ref to save data from result_field if it's available rather then
      from *ref on save_in_field() call.
      
      
      
      sql/item.h:
         Fix bug#11298 insert into select from VIEW produces incorrect result when using ORDER BY
      sql/item.cc:
        Fix bug#11298 insert into select from VIEW produces incorrect result when using ORDER BY
      mysql-test/r/view.result:
        Test case for bug#11298 insert into select from VIEW produces incorrect result when using ORDER BY
      mysql-test/t/view.test:
        Test case for bug#11298 insert into select from VIEW produces incorrect result when using ORDER BY
      401fa3cb
  2. 21 Jun, 2005 17 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 8f011afe
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      8f011afe
    • unknown's avatar
      fixed view fields names check and generation (changed after Trudy review:... · 612de7c6
      unknown authored
      fixed view fields names check and generation (changed after Trudy review: underlying field names treat as user set ones) (BUG#7448)
      
      
      mysql-test/r/view.result:
        test of view field names generation
      mysql-test/t/view.test:
        test of view field names generation
      sql/item.cc:
        add a flag that indicates that the name of the item was an auto-generated one and so can be changed in a view
      sql/item.h:
        add a flag that indicates that the name of the item was an auto-generated one and so can be changed in a view
        layout fixed
      sql/item_func.cc:
        line made less then 80 columns
      sql/sql_view.cc:
        fixed checking of duplicates of view fields:
        1) case-insensitive system charset/collation is used now to compare view filds
        2) in case if the duplicate field name was of an auto-generated one, we create another unique name for it
      sql/sql_yacc.yy:
        add a flag that indicates that the name of the item was an auto-generated one and so can be changed in a view
      612de7c6
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 15e922f8
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-5.0
      
      
      15e922f8
    • unknown's avatar
      A preparatory patch to help adding JOIN::transform() and move one-time · 04f6f63d
      unknown authored
      query transformations to the PREPARE stage (prepared statements).
      
      
      sql/item.h:
        Remove an unused friend declaration.
      sql/mysql_priv.h:
        Change signature of insert_fields()
      sql/sp_head.cc:
        Make is_stmt_prepare_or_first_sp_execute really work: reset SP state
        to EXECUTED after execution.
      sql/sql_base.cc:
        allocate_view_names flag of insert_fields is removed.
        The purpose of this variable was to amend the case when a view
        is replaced with a base table between subsequent executions of a prepared
        statement: in that case the new table theoretically can be used instead
        of the view. If allocate_view_names was set,
        all the references to the view expressions were replaced with Item_field's
        which in turn could have been resolved by their names.
        But this approach doesn't work for other reasons, so let's not try
        to help what must be solved by TDC.
      sql/sql_class.h:
        Add is_first_sp_execute() helper method.
      sql/sql_handler.cc:
        insert_fields signature changed.
      sql/sql_lex.h:
        Add a comment for variable 'first_execution'.
      04f6f63d
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · e85b0013
      unknown authored
      into  moonbone.local:/work/mysql-5.0-bug-7422
      
      
      mysql-test/r/view.result:
        SCCS merged
      mysql-test/t/view.test:
        SCCS merged
      e85b0013
    • unknown's avatar
      Fix bug #7422 "order by" doesn't work · c4257ae3
      unknown authored
      Field with wrong buffer was used to make sort key, which results in producing
      same sort key for all records.
      
      
      
      sql/filesort.cc:
        Fix bug#7422 "order by" doesn't work
      mysql-test/t/view.test:
        Test case for bug#7422 "order by" doesn't work
      mysql-test/r/view.result:
        Test case for bug#7422 "order by" doesn't work
      c4257ae3
    • unknown's avatar
      group_by.result, group_by.test: · 8f318ec5
      unknown authored
        Correction for the test case of bug #11295 to remove
        warning.
      
      
      mysql-test/t/group_by.test:
        Correction for the test case of bug #11295 to remove
        warning.
      mysql-test/r/group_by.result:
        Correction for the test case of bug #11295 to remove
        warning.
      8f318ec5
    • unknown's avatar
      Manual merge · 109161c3
      unknown authored
      
      sql/item_buff.cc:
        Auto merged
      109161c3
    • unknown's avatar
      log0log.c: · 77514fbc
      unknown authored
        log_checkpoint_margin(): Correct a typo that was introduced
        when fixing gcc 4.0 warnings.
      
      
      innobase/log/log0log.c:
        log_checkpoint_margin(): Correct a typo that was introduced
        when fixing gcc 4.0 warnings.
      77514fbc
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 472a2b51
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-1
      
      
      472a2b51
    • unknown's avatar
      group_by.result, group_by.test: · 7b1ec027
      unknown authored
        Added a test case for bug #11295.
      item_buff.cc:
        Fixed bug #11295.
        This a correction for the patch of bug #11088 that takes into
        account a possible NULL values of the BLOB column.
      
      
      sql/item_buff.cc:
        Fixed bug #11295.
        This a correction for the patch of bug #11088 that takes into
        account a possible NULL values of the BLOB column.
      mysql-test/t/group_by.test:
        Added a test case for bug #11295.
      mysql-test/r/group_by.result:
        Added a test case for bug #11295.
      7b1ec027
    • unknown's avatar
      InnoDB: Remove some warnings reported by GCC 4.0.0. · 0bfbba10
      unknown authored
      
      innobase/log/log0recv.c:
        Remove GCC 4.0.0 warnings about possibly uninitialized variables.
      innobase/row/row0umod.c:
        row_undo_mod_undo_also_prev_vers(): Remove unused parameter thr,
        always initialize *undo_no to remove GCC 4.0.0 warning
      innobase/trx/trx0undo.c:
        trx_undo_write_xid(): Remove warning about signedness mismatch,
        add const qualifier to parameter xid.
      sql/ha_innodb.cc:
        Add proper casts from ulonglong to ulong in fprintf statements.
      0bfbba10
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2db945e3
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      2db945e3
    • unknown's avatar
      InnoDB: adjust test result · bf6a86af
      unknown authored
      
      mysql-test/r/innodb.result:
        Current default is innodb_thread_concurrency=20
      bf6a86af
    • unknown's avatar
      Merge hundin.mysql.fi:/home/marko/mysql-5.0 · 2fb07495
      unknown authored
      into hundin.mysql.fi:/home/marko/mysql-5.0-current
      
      
      innobase/dict/dict0dict.c:
        Auto merged
      innobase/fil/fil0fil.c:
        Auto merged
      innobase/include/lock0lock.h:
        Auto merged
      innobase/lock/lock0lock.c:
        Auto merged
      innobase/os/os0file.c:
        Auto merged
      innobase/row/row0ins.c:
        Auto merged
      innobase/row/row0mysql.c:
        Auto merged
      innobase/srv/srv0start.c:
        Auto merged
      innobase/trx/trx0trx.c:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      2fb07495
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · c2e97308
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      c2e97308
    • unknown's avatar
      mysql-test-run.pl: · e74d5313
      unknown authored
        More compact and safe handling of path names.
        Support for running in Windows source tree.
        Use libtool wrapper, instead of messing with
        library path names, and objects in .libs dir.
      mtr_misc.pl:
        Utility function that search aand check path names
      mtr_report.pl:
        Patch by Carsten, set correct reject/result/eval if not main suite
      
      
      mysql-test/lib/mtr_report.pl:
        Patch by Carsten, set correct reject/result/eval if not main suite
      mysql-test/lib/mtr_misc.pl:
        Utility function that search aand check path names
      mysql-test/mysql-test-run.pl:
        More compact and safe handling of path names.
        Support for running in Windows source tree.
        Use libtool wrapper, instead of messing with
        library path names, and objects in .libs dir.
      e74d5313
  3. 20 Jun, 2005 21 commits
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-clean · 3f6501c5
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      VC++Files/client/mysqlclient.dsp:
        Auto merged
      VC++Files/libmysql/libmysql.dsp:
        Auto merged
      client/mysql.cc:
        Auto merged
      myisam/ft_boolean_search.c:
        Auto merged
      mysql-test/r/fulltext.result:
        Auto merged
      mysql-test/t/fulltext.test:
        Auto merged
      vio/viosocket.c:
        Auto merged
      3f6501c5
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · e17de6ec
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      e17de6ec
    • unknown's avatar
      Merge · 2bf4fa73
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/group_by.result:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/field.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      2bf4fa73
    • unknown's avatar
      mtr_cases.pl: · d73327e1
      unknown authored
        Bug#11466: Script can now get test case name
        from test case file path on command line
      mysql-test-run.pl:
        Bug#11466: Added --skip-ndbcluster/--skip-ndb option
      mtr_cases.pl:
        Don't set --default-time-zone if opt file sets it
        Restart the server if time zone is given in opt file
      mysql-test-run.pl:
        Don't remove symlink to "var" directory in cleanup
        Removed duplicate/unessesary options to mysqld
      
      
      mysql-test/mysql-test-run.pl:
        Bug#11466: Added --skip-ndbcluster/--skip-ndb option
      mysql-test/lib/mtr_cases.pl:
        Bug#11466: Script can now get test case name
        from test case file path on command line
      d73327e1
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · bcec3fa5
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      bcec3fa5
    • unknown's avatar
      Merge jwinstead@production.mysql.com:my/mysql-4.1-win · 30f67d70
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      30f67d70
    • unknown's avatar
      Merge jwinstead@production.mysql.com:my/mysql-4.1-10840 · 305fe79c
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      305fe79c
    • unknown's avatar
      Merge jwinstead@production.mysql.com:my/mysql-4.1-7858 · 641bd4ec
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      641bd4ec
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 36dcc209
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      
      36dcc209
    • unknown's avatar
      group_by.result: · 15b113e1
      unknown authored
        Added  a test case for bug #11385.
      group_by.test:
        Added  a test case for bug #11385.
      field.h:
        Fixed bug #11385.
        The bug was due to not defined method decimals for the class
        Field_datetime.
      
      
      sql/field.h:
        Fixed bug #11385.
        The bug was due to not defined method decimals for the class
        Field_datetime.
      mysql-test/t/group_by.test:
        Added  atest case for bug #11385.
      mysql-test/r/group_by.result:
        Added  a test case for bug #11385.
      15b113e1
    • unknown's avatar
      Fix handling of command-line on Windows, missed as part of earlier · 7b24dad4
      unknown authored
      commit. (Bug #10840)
      
      
      client/mysql.cc:
        Add cast of unsigned value stored in signed char
      7b24dad4
    • unknown's avatar
      Makefile.am: · 0f5b946c
      unknown authored
        Corrected dependency for "lex_hash.h", to avoid occasional make failure
      
      
      sql/Makefile.am:
        Corrected dependency for "lex_hash.h", to avoid occasional make failure
      0f5b946c
    • unknown's avatar
      Merge · 4467b464
      unknown authored
      4467b464
    • unknown's avatar
      ha_ndbcluster.cc: · 84da8b22
      unknown authored
        Added CR for readability
      
      
      sql/ha_ndbcluster.cc:
        Added CR for readability
      84da8b22
    • unknown's avatar
      Added comment to store_lock · b8cbed7c
      unknown authored
      b8cbed7c
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · e0e1adc3
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
      
      
      e0e1adc3
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2c7095c8
      unknown authored
      into igor-inspiron.creware.com:/home/igor/mysql-4.1
      
      
      sql/sql_select.cc:
        Auto merged
      2c7095c8
    • unknown's avatar
      Manual merge of patch for bug#11060 "Server crashes on calling stored · d83c2643
      unknown authored
      procedure with INSERT SELECT UNION SELECT" aka "Server crashes on
      re-execution of prepared INSERT ... SELECT with UNION" into 5.0 tree.
      
      
      mysql-test/r/ps.result:
        Manual merge.
      mysql-test/t/ps.test:
        Manual merge.
      sql/sql_insert.cc:
        Manual merge.
      d83c2643
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 79444fa5
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-bg11060
      
      
      79444fa5
    • unknown's avatar
      Fix for bug #11060 "Server crashes on re-execution of prepared · 78e6794b
      unknown authored
      INSERT ... SELECT with UNION" (reviewed version).
      
      Altough bug manifest itself only starting from 5.0 it is better to
      apply fix to 4.1 to keep some assumptions true and make code more
      future-proof.
      
      
      mysql-test/r/ps.result:
        Added test case for bug #11060 "Server crashes on re-execution of
        prepared INSERT ... SELECT with UNION".
      mysql-test/t/ps.test:
        Added test case for bug #11060 "Server crashes on re-execution of
        prepared INSERT ... SELECT with UNION".
      sql/sql_insert.cc:
        select_insert::prepare():
          Item::fix_fields() methods operate assuming that LEX::current_select
          points to the select to which current item belongs. Thus
          during check_insert_fields() routine execution LEX::current_select
          should point ot the first select in query since this is the
          select with which items in insert list is associated.
          But if we have INSERT SELECT UNION SELECT type of query
          LEX::current_select will point to the fake_select_lex instead
          since select_insert::prepare() is called during processing of JOIN
          which corresponds to this select_lex.
          So we have set LEX::current_select before calling check_insert_fields()
          and restore it afterwards.
      78e6794b
    • unknown's avatar
      Fix a formatting bug and add a test for it. · c8c0140e
      unknown authored
      
      sql/share/errmsg.txt:
        Fix a formatting bug.
      sql/sql_prepare.cc:
        Fix a formatting bug.
      tests/mysql_client_test.c:
        Test the server side error message.
      c8c0140e