1. 20 Jun, 2005 24 commits
    • 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 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
      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 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
    • unknown's avatar
      Merge · 28d40442
      unknown authored
      28d40442
    • unknown's avatar
      Makefile.am: · c8714788
      unknown authored
        Use the Perl version of mysql-test-run
      
      
      Makefile.am:
        Use the Perl version of mysql-test-run
      c8714788
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · 1c756c04
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      1c756c04
    • unknown's avatar
      mysql-test-run.pl: · 2aa1a04c
      unknown authored
        Corrected path to 'mysql_fix_privilege_tables'
      
      
      mysql-test/mysql-test-run.pl:
        Corrected path to 'mysql_fix_privilege_tables'
      2aa1a04c
    • unknown's avatar
      mysql-test-run.pl: · 92d9f2ca
      unknown authored
        Added --log-bin-trust-routine-creators to server start
        Increase and autoextend innodb tables
      
      
      mysql-test/mysql-test-run.pl:
        Added --log-bin-trust-routine-creators to server start
        Increase and autoextend innodb tables
      92d9f2ca
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · 00787a9c
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      00787a9c
    • unknown's avatar
      mysql-test-run.pl: · d0a7c124
      unknown authored
        Corrected path to 'mysql_fix_privilege_tables'
        Corrected dummy --manager-port to take integer argument
      
      
      mysql-test/mysql-test-run.pl:
        Corrected path to 'mysql_fix_privilege_tables'
      d0a7c124
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2ccb5106
      unknown authored
      into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
      
      
      sql/item_buff.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      2ccb5106
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 34dc6ac3
      unknown authored
      into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1
      
      
      34dc6ac3
    • unknown's avatar
      Merge dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1 · e9a87395
      unknown authored
      into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      e9a87395
    • unknown's avatar
      ha_ndbcluster.cc: · 1bc23847
      unknown authored
        remove typecheck in ndb handler not needed
      
      
      sql/ha_ndbcluster.cc:
        remove typecheck in ndb handler not needed
      1bc23847
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main · 485e941e
      unknown authored
      into mysql.com:/home/stewart/Documents/MySQL/5.0/main
      
      
      ndb/src/kernel/SimBlockList.cpp:
        Auto merged
      485e941e
    • unknown's avatar
      BUG#11377 Building cluster in 4.1 BK tree fails with GCC4.0 · 8d87d9bf
      unknown authored
      
      ndb/src/kernel/SimBlockList.cpp:
        GCC 4.0 build fix
      8d87d9bf
  2. 19 Jun, 2005 8 commits
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · c7e49b6b
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      mysql-test/Makefile.am:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      c7e49b6b
    • unknown's avatar
      mysql-test-run.pl: · f35c177a
      unknown authored
        Added dummy --manager-port flag, for backward compatibility
        Back port from 5.0, correction of paths to SSL pem files
      mtr_cases.pl:
        Removed hard coded exclude list for embedded server
      mysql-test-run.pl:
        Set environment variable MYSQL_SHOW, to be used in test cases
      
      
      mysql-test/lib/mtr_cases.pl:
        Removed hard coded exclude list for embedded server
      mysql-test/mysql-test-run.pl:
        Added dummy --manager-port flag, for backward compatibility
        Back port from 5.0, correction of paths to SSL pem files
      f35c177a
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · fc390fe6
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      fc390fe6
    • unknown's avatar
      WL#2286 - Compile MySQL w/YASSL support · 2c8ee686
      unknown authored
      Fix for yaSSL link failures with Forte Developer 7, MIPSpro Compilers, Compaq C++.
      These compilers have problem with implicit template instantiation in archives
      (libyassl.a, libtaocrypt.a). Instantiate templates explicitly.
      
      Fix for yaSSL link failure on powermacg5 (gcc 3.3). When -O3 is specified gcc inlines
      __cxa_pure_virtual. This is wrong behavior, __cxa_pure_virtual must never be inlined.
      
      
      configure.in:
        Better CXX_VERSION guessing.
        EXPLICIT_TEMPLATE_INSTANTIATION macro indicates whether to instantiate templates explicitly.
        Instantiate templates explicitly on MIPSpro, Compaq, Forte.
      extra/yassl/src/crypto_wrapper.cpp:
        Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
      extra/yassl/src/template_instnt.cpp:
        Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
        More portable templates instantiation.
      extra/yassl/src/yassl_int.cpp:
        Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
        More portable templates instantiation.
      extra/yassl/taocrypt/include/runtime.hpp:
        Fix for link failure on powermacg5 (gcc 3.3). __cxa_pure_virtual must never be inlined.
      extra/yassl/taocrypt/src/algebra.cpp:
        Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
      extra/yassl/taocrypt/src/integer.cpp:
        Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
      extra/yassl/taocrypt/src/template_instnt.cpp:
        Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
      sql/field.cc:
        Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
      sql/item.cc:
        Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
      sql/item_buff.cc:
        Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
      sql/mysqld.cc:
        Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
      sql/opt_range.cc:
        Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
      sql/set_var.cc:
        Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
      sql/slave.cc:
        Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
      sql/sql_acl.cc:
        Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
      sql/sql_class.cc:
        Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
      sql/sql_insert.cc:
        Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
      sql/sql_map.cc:
        Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
      sql/sql_select.cc:
        Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
      sql/sql_show.cc:
        Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
      sql/table.cc:
        Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
      2c8ee686
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6f86198b
      unknown authored
      into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
      
      
      6f86198b
    • unknown's avatar
      correcting error messages after discussion with Paul (replication of routines). · ac442144
      unknown authored
      
      mysql-test/r/rpl_sp.result:
        result update
      sql/share/errmsg.txt:
        correcting error messages after discussion with Paul.
      ac442144
    • unknown's avatar
      Rewrite the test for Bug#9992. · c4bd17c0
      unknown authored
      c4bd17c0
    • unknown's avatar
      0f92333d
  3. 18 Jun, 2005 3 commits
  4. 17 Jun, 2005 5 commits
    • unknown's avatar
      Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0945dea8
      unknown authored
      into xiphis.org:/usr/home/antony/work2/p3-bug6877.3
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/table.cc:
        Auto merged
      0945dea8
    • unknown's avatar
      Bug#6877 MySQL should give an error if the requested table type is not available · c25470e3
      unknown authored
        Implement new SQL mode - NO_ENGINE_SUBSTITUTION
      
      
      mysql-test/r/sql_mode.result:
        Test for bug 6877
      mysql-test/t/sql_mode.test:
        Test for bug 6877
      sql/handler.cc:
        change to ha_checktype()
      sql/handler.h:
        change to ha_checktype()
      sql/mysql_priv.h:
        new sql mode NO_ENGINE_SUBSTITUTION
        change to args for get_table_type() and create_frm()
      sql/mysqld.cc:
        new sql mode NO_ENGINE_SUBSTITUTION
      sql/set_var.cc:
        change to ha_checktype() args
      sql/sql_delete.cc:
        change to get_table_type() args
      sql/sql_rename.cc:
        change to get_table_type() args
      sql/sql_table.cc:
        move common code to check_engine()
        change to ha_checktype(), get_table_type() args
      sql/table.cc:
        change to ha_checktype(), create_frm(), get_table_type() args
      sql/unireg.cc:
        change to create_frm() args
      c25470e3
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · f16b102f
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
      
      
      f16b102f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c0918af2
      unknown authored
      into mysql.com:/opt/local/work/mysql-5.0-10736
      
      
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      c0918af2
    • unknown's avatar
      Rename all prepared statements COM_ commands to prefix with COM_STMT_ · 63c21c07
      unknown authored
      
      libmysql/libmysql.c:
        Rename.
      libmysqld/lib_sql.cc:
        Rename.
      sql/item_cmpfunc.cc:
        Use proper method to check for stmt prepare, only_prepare is removed.
      sql/mysql_priv.h:
        Remove an obsolete define. Rename mysql_stmt_free to mysql_stmt_close.
      sql/sql_class.h:
        Remove THD::only_prepare.
        Rename.
      sql/sql_lex.cc:
        Rename COM_PREPARE -> COM_STMT_PREPARE
      sql/sql_parse.cc:
        Rename.
      sql/sql_prepare.cc:
        Rename.
      sql/sql_yacc.yy:
        Rename.
      tests/mysql_client_test.c:
        Rename.
      63c21c07