1. 28 Aug, 2007 11 commits
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint · 68eeedfd
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
      
      
      extra/yassl/include/openssl/crypto.h:
        Auto merged
      extra/yassl/include/openssl/ssl.h:
        Auto merged
      extra/yassl/include/yassl_int.hpp:
        Auto merged
      extra/yassl/src/ssl.cpp:
        Auto merged
      extra/yassl/src/yassl_int.cpp:
        Auto merged
      vio/viossl.c:
        Auto merged
      mysql-test/suite/rpl/t/rpl_ssl.test:
        Merge 5.0->5.1
      68eeedfd
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/bug28812/my50-bug28812 · 484069cf
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
      
      
      484069cf
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/yassl_import/my50-yassl_import · b8c3ba1f
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/bug28812/my50-bug28812
      
      
      b8c3ba1f
    • unknown's avatar
      Bug#28812 rpl_ssl fails due to assert in extra/yassl/src/socket_wrapper.cpp:117 · 9c3a03a2
      unknown authored
       - Merge sslaccept and sslconnect.
       - Atomically "reset" vio to VIO_TYPE_SSL when the SSL connection has
         succeeded, this avoids having to revert anything and thus protects
         against "close_active_vio" in the middle.
       - Add some variance to the testcase
      
      
      mysql-test/t/rpl_ssl.test:
        Add some variance by running two selects before stopping the slave
        Check that number of records in t1 are equal on master and slave
      vio/viossl.c:
        Rewrite sslconnect and sslaccept to automically "reset" the vio
        to VIO_TYPE_SSL. Also use the fd from 'SSL_get_fd' to avoid
        setting vio->sd to -1, that previously occured when "close_active_vio"
        was called during connect/accept.
        
        Merge the two function since they were exactly the same except for one line.
        
        Update the DBUG printouts to be generic(i.e use peer instead of client/server).
      9c3a03a2
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-maint · f13905e1
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
      
      
      f13905e1
    • unknown's avatar
      Import yaSSL version 1.7.2 · fe4abfb2
      unknown authored
      - Fix bug#27265
      - Support for fixing bug#18441
      
      
      extra/yassl/include/openssl/crypto.h:
        Import patch yassl.diff
      extra/yassl/include/openssl/ssl.h:
        Import patch yassl.diff
      extra/yassl/include/yassl_int.hpp:
        Import patch yassl.diff
      extra/yassl/src/handshake.cpp:
        Import patch yassl.diff
      extra/yassl/src/socket_wrapper.cpp:
        Import patch yassl.diff
      extra/yassl/src/ssl.cpp:
        Import patch yassl.diff
      extra/yassl/src/yassl_int.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/coding.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/crypto.cpp:
        Import patch yassl.diff
      extra/yassl/include/openssl/des_old.h:
        Import patch yassl.diff
      extra/yassl/include/openssl/evp.h:
        Import patch yassl.diff
      extra/yassl/include/openssl/hmac.h:
        Import patch yassl.diff
      extra/yassl/include/openssl/objects.h:
        Import patch yassl.diff
      extra/yassl/include/openssl/sha.h:
        Import patch yassl.diff
      extra/yassl/include/openssl/prefix_ssl.h:
        Update prefixes
      fe4abfb2
    • unknown's avatar
      Post-merge fixes · 8e0805db
      unknown authored
      
      sql/ha_partition.cc:
        Post-merge fix (remove duplicate definition of ::column_bitmaps_signal)
      sql/mysqld.cc:
        Post-merge fix (cast away some compiler warnings in DBUG_PRINT, remove
        duplicate definition of OPT_KEEP_FILES_ON_CREATE).
      8e0805db
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/51-target22-X · 95834a51
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      configure.in:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/partition_pruning.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/suite/rpl/include/rpl_mixed_ddl.inc:
        Auto merged
      mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
        Auto merged
      mysql-test/suite/rpl/r/rpl_timezone.result:
        Auto merged
      mysql-test/suite/rpl/t/rpl_relayspace.test:
        Auto merged
      mysql-test/suite/rpl/t/rpl_timezone.test:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      netware/BUILD/compile-netware-END:
        Auto merged
      netware/Makefile.am:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/ha_partition.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/time.cc:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      storage/innobase/log/log0recv.c:
        Auto merged
      storage/innobase/srv/srv0srv.c:
        Auto merged
      storage/innobase/trx/trx0trx.c:
        Auto merged
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        manual merge (use remote)
      mysql-test/suite/rpl/t/disabled.def:
        Manual merge - both rpl_innodb_mixed_ddl and rpl_innodb_mixed_dml
        are fixed, and should be run as part of the rpl suite.
      95834a51
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 235e7520
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      sql/sql_show.cc:
        Auto merged
      235e7520
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/51 · 4ffd70ca
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      client/mysql_upgrade.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      4ffd70ca
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/50 · d54f42c1
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      sql/sql_show.cc:
        Auto merged
      d54f42c1
  2. 27 Aug, 2007 29 commits
    • unknown's avatar
      Bug #30389: connection_id() always return 0 in embedded server · 61e988e7
      unknown authored
        
      Initialize thd->variables.pseudo_thread_id when a new embedded
      thd is created.
      
      
      libmysqld/lib_sql.cc:
        Add comment regarding duplication of code in create_embedded_thd()
        vs. create_new_thread() and prepare_new_connection_state().  This
        was a cause for not properly initializing the pseudo_thread_id variable.
      mysql-test/r/func_misc.result:
        Add test case to ensure connection_id() returns a sane value
      mysql-test/t/func_misc.test:
        Add test case to ensure connection_id() returns a sane value
      sql/mysqld.cc:
        Add comment warning of the duplication of code between create_new_thread()
        and create_embedded_thd()
      sql/sql_connect.cc:
        Add comment warning of the duplication of code between
        prepare_new_connection_state() and create_embedded_thd()
      61e988e7
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22 · ad4ee206
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/51-target22-X
      
      
      sql/ha_partition.cc:
        Auto merged
      ad4ee206
    • unknown's avatar
      Bug #30412 and Bug #30413 · 048775df
      unknown authored
      Update some tests in the "parts" suite, so they're skipped if the
      requisite plugins are not present in the mysqld.
      
      
      mysql-test/suite/parts/t/partition_char_innodb.test:
        Skip if mysqld doesn't include InnoDB support
      mysql-test/suite/parts/t/partition_datetime_innodb.test:
        Skip if mysqld doesn't include InnoDB support
      mysql-test/suite/parts/t/partition_decimal_innodb.test:
        Skip if mysqld doesn't include InnoDB support
      mysql-test/suite/parts/t/partition_float_innodb.test:
        Skip if mysqld doesn't include InnoDB support
      mysql-test/suite/parts/t/partition_int_innodb.test:
        Skip if mysqld doesn't include InnoDB support
      mysql-test/suite/parts/t/partition_special_innodb.test:
        Skip if mysqld doesn't include InnoDB support
      mysql-test/suite/parts/t/rpl_partition.test:
        Skip if mysqld doesn't include partition support
      048775df
    • unknown's avatar
      Fixes for the following bugs: · bfed329e
      unknown authored
      Bug #30316: Some "parts" tests fail because the server uses "--secure-file-priv"
      Bug #30341: Test suite "parts" needs to be adapted to the new rules disallowing many functio
      Bug #30408: Suite "parts" needs bug numbers updated
      Bug #30411: Suite "parts" needs bug numbers updated: ER_UNIQUE_KEY_NEED_ALL_FIELDS_IN_PF
      Bug #30576: part_supported_sql_func_innodb.test tries to LOAD DATA outside of var dir
      Bug #30581: partition_value tests use disallowed CAST() function
      
      Included are some general fixes to allow the "parts" test suite to be run
      successfully.  This includes disabling a few tests or parts of tests,
      cleaning up the test cases and their results, etc.  Basically, these tests
      have not been run for some time, and had suffered some bit rot.
      
      The bugs were fixed as a single changeset, because in some ways they depend
      on each other.  I couldn't be sure I'd updated all the error codes (for
      bugs 30408 and 30411) without also adapting to the new allowed functions
      rules (bug 30341), and vice versa.
      
      
      mysql-test/include/partition_layout.inc:
        Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
      mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc:
        Add ASCII(), ORD() and WEEKOFYEAR() as blocked functions (they depend
        too much on character set, etc.).
        
        Remove DATEDIFF() as a blocked function (it is implemented in terms
        of TO_DAYS() and the minus operator).
      mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc:
        Remove ASCII(), ORD() and WEEKOFYEAR(), which are not allowed functions.
        
        Remove uses of CAST() in partitioning functions - it is not allowed.
        
        Disable testing of FLOOR() and CEILING on non-integer fields, due to
        Bug 30577.
        
        Test MOD() with an integer field instead of floating point (it has a
        hybrid result type, like FLOOR() and CEILING(), but makes sense to use
        with an integer field).
        
        Add DATEDIFF() as an allowed function, because it is implemented in
        terms of TO_DAYS() and the minus operator.
      mysql-test/suite/parts/inc/partition_alter3.inc:
        Remove use of disallowed CAST() function in partitioning
      mysql-test/suite/parts/inc/partition_blocked_sql_funcs.inc:
        The blocked functions are actually blocked now, so expect errors.
        
        This is a result of the fix for bug 18198.
      mysql-test/suite/parts/inc/partition_date.inc:
        Remove uses of CAST() in partitioning functions - it is not allowed.
      mysql-test/suite/parts/inc/partition_datetime.inc:
        Remove uses of CAST() in partitioning functions - it is not allowed.
      mysql-test/suite/parts/inc/partition_decimal.inc:
        Remove uses of CAST() in partitioning functions - it is not allowed.
        
        Disable testing of FLOOR() and CEILING(), due to Bug 30577.
      mysql-test/suite/parts/inc/partition_directory.inc:
        Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
      mysql-test/suite/parts/inc/partition_double.inc:
        Remove uses of CAST() in partitioning functions - it is not allowed.
        
        Disable testing of FLOOR() and CEILING(), due to Bug 30577.
      mysql-test/suite/parts/inc/partition_enum.inc:
        Remove use of CAST(), which is disallowed.
        
        Remove test which relies on CAST().
      mysql-test/suite/parts/inc/partition_float.inc:
        Remove uses of CAST() in partitioning functions - it is not allowed.
        
        Disable testing of FLOOR() and CEILING(), due to Bug 30577.
      mysql-test/suite/parts/inc/partition_layout_check1.inc:
        Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
      mysql-test/suite/parts/inc/partition_layout_check2.inc:
        Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
      mysql-test/suite/parts/inc/partition_methods1.inc:
        Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
      mysql-test/suite/parts/inc/partition_set.inc:
        Remove test which relies on CAST(), which is disallowed.
      mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc:
        Fix Bug #30576: part_supported_sql_func_innodb.test tries to LOAD DATA outside of var dir
        
        Move data files into std_data/parts/*, so they can be used with LOAD
        DATA INFILE '../std_data_ln/parts/*' while --secure-file-priv is in
        force.
      mysql-test/suite/parts/inc/partition_syntax.inc:
        Remove use of CAST(), which is disallowed.
      mysql-test/suite/parts/inc/partition_time.inc:
        Remove use of CAST(), which is disallowed.
      mysql-test/suite/parts/inc/partition_timestamp.inc:
        Remove use of CAST(), which is disallowed.
      mysql-test/suite/parts/inc/partition_value.inc:
        Disable this entire test file, because it relies on using CAST() as
        a partitioning function, which is disallowed.  See Bug 30581,
        "partition_value tests use disallowed CAST() function".
      mysql-test/suite/parts/r/part_blocked_sql_func_innodb.result:
        Update test case results
      mysql-test/suite/parts/r/part_blocked_sql_func_myisam.result:
        Update test case results
      mysql-test/suite/parts/r/part_supported_sql_func_innodb.result:
        Update test case results
      mysql-test/suite/parts/r/part_supported_sql_func_myisam.result:
        Update test case results
      mysql-test/suite/parts/r/partition_alter3_innodb.result:
        Update test case results
      mysql-test/suite/parts/r/partition_alter3_myisam.result:
        Update test case results
      mysql-test/suite/parts/r/partition_basic_innodb.result:
        Update test case results
      mysql-test/suite/parts/r/partition_basic_myisam.result:
        Update test case results
      mysql-test/suite/parts/r/partition_datetime_innodb.result:
        Update test case results
      mysql-test/suite/parts/r/partition_datetime_myisam.result:
        Update test case results
      mysql-test/suite/parts/r/partition_decimal_innodb.result:
        Update test case results
      mysql-test/suite/parts/r/partition_decimal_myisam.result:
        Update test case results
      mysql-test/suite/parts/r/partition_float_myisam.result:
        Update test case results
      mysql-test/suite/parts/r/partition_syntax_innodb.result:
        Update test case results
      mysql-test/suite/parts/r/partition_syntax_myisam.result:
        Update test case results
      mysql-test/suite/parts/t/disabled.def:
        Mark several more tests as disabled: partition_value_myisam,
        partition_value_innodb, part_supported_sql_func_ndb,
        rpl_ndb_dd_partitions, and partition_float_innodb
      mysql-test/std_data/parts/part_supported_sql_funcs_int_ch1.inc:
        Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_ch1.inc
      mysql-test/std_data/parts/part_supported_sql_funcs_int_date.inc:
        Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_date.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_date.inc
      mysql-test/std_data/parts/part_supported_sql_funcs_int_float.inc:
        Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_float.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_float.inc
      mysql-test/std_data/parts/part_supported_sql_funcs_int_int.inc:
        Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_int.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_int.inc
      mysql-test/std_data/parts/part_supported_sql_funcs_int_time.inc:
        Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_time.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_time.inc
      mysql-test/suite/parts/inc/partition_alter_1.inc:
        Correct expected error codes, which changed due to bug 29245.
      mysql-test/suite/parts/inc/partition_check.inc:
        Correct expected error codes, which changed due to bug 29245.
      mysql-test/suite/parts/inc/partition_syntax_1.inc:
        Correct expected error codes, which changed due to bug 29245.
      bfed329e
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · f69bba46
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
      
      
      client/mysqlslap.c:
        Auto merged
      storage/example/ha_example.cc:
        Auto merged
      f69bba46
    • unknown's avatar
      Bug #30648: Partition handler may not initialize variable used w/ autoincrement · 41c849dd
      unknown authored
      A local variable may be used uninitialized in 
      ha_partition::get_auto_increment().  Initialize it properly.
      
      
      sql/ha_partition.cc:
        Initialize first_value_part in ha_partition::get_auto_increment() with *first_value before
        it's used in the underlying table handler.  Thanks to Antony for digging up this fix.
      41c849dd
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22 · 66262046
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
      
      
      sql/field.cc:
        Auto merged
      66262046
    • unknown's avatar
      Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue · 2bf5b1aa
      unknown authored
      
      sql/field.cc:
        - always pack in little endian, irrespective of starage engine native format
        - always unpack as if it is atored in little endian, and unpack it to storage engine native format
      2bf5b1aa
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-target-5.1.22 · 75fe12a1
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/mysql-5.1-target-5.1.22-joro
      
      
      75fe12a1
    • unknown's avatar
      portation fixes for bug 29536 and 29325 in · 2ed51552
      unknown authored
      re-pushing for 5.1.22.
      
      
      mysql-test/suite/rpl/t/rpl_timezone.test:
        typo fixed in re-pushing bug 29536
      sql/mysqld.cc:
        portation fixes ->5.1 for bug 29325
      2ed51552
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22 · 0e7c9704
      unknown authored
      into  trift2.:/MySQL/M51/target-5.1.22
      
      
      0e7c9704
    • unknown's avatar
      Enable abi_check for 5.1 · 1413fdb2
      unknown authored
       - Run icheck on all files in HEADERS_ABI list 
       - Update reference 
      
      
      include/Makefile.am:
        Enable abi_check for external API header files
      include/mysql_h.ic:
        Update abi_check reference
      1413fdb2
    • unknown's avatar
      Merge trift2.:/MySQL/M51/netware3-5.1 · c749a21a
      unknown authored
      into  trift2.:/MySQL/M51/target-5.1.22
      
      
      configure.in:
        Auto merged
      c749a21a
    • unknown's avatar
      Bug#28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE · 88c77812
      unknown authored
       - Set sql_mode to default when creating system tables
      
      
      scripts/mysql_system_tables.sql:
        set sql_mode = "" when creating the system tables
      88c77812
    • unknown's avatar
      More cleanup / fixing for NetWare: · d7774462
      unknown authored
      1) "test_db.sql" is a plaintext file, no binary;
      2) do not try to strip the binaries, it will not work.
      
      
      configure.in:
        For NetWare, we cannot strip the binaries, so there is no use in attempting it.
      scripts/make_binary_distribution.sh:
        Get rid of a typing error, introduced when a following file name was deleted.
      d7774462
    • unknown's avatar
      Cset exclude: msvensson@pilot.(none)|ChangeSet|20070827092310|49459 · caf6f3d9
      unknown authored
      
      scripts/mysql_system_tables.sql:
        Exclude
      caf6f3d9
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22 · b1e78d13
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
      
      
      b1e78d13
    • unknown's avatar
      repair some rpl_ndb test cases · 3abd50cb
      unknown authored
      
      BitKeeper/deleted/.del-rpl_ndb_myisam2ndb-master.opt:
        Delete: mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-master.opt
      mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result:
        BitKeeper file /home/tomas/mysql-5.1-target-5.1.22/mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result:
        BitKeeper file /home/tomas/mysql-5.1-target-5.1.22/mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result
      3abd50cb
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 87f07481
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      configure.in:
        null-merge
      87f07481
    • unknown's avatar
      adjust version number · 7388ea3c
      unknown authored
      
      configure.in:
        adjust version number after 5.0.48 clone-off
      7388ea3c
    • unknown's avatar
      re-push of Bug 29536 for 5.1.22: timestamp inconsistent in replication around 1970 · af9f7a23
      unknown authored
        
      MySQL replicates the time zone only when operations that involve
      it are performed. This is controlled by a flag. But this flag
      is set only on successful operation.
      The flag must be set also when there is an error that involves
      a timezone (so the master would replicate the error to the slaves).
      
      
      mysql-test/suite/rpl/r/rpl_timezone.result:
        repush of Bug 29536 for 5.1.22 tree: test case
      mysql-test/suite/rpl/t/rpl_timezone.test:
        repush of Bug 29536 for 5.1.22 tree: test case
      sql/field.cc:
        re-push of Bug 29536 for 5.1.22: move setting of the flag before the operation
        (so it apples to errors as well).
      sql/time.cc:
        re-push of Bug 29536 for 5.1.22: move setting of the flag before the operation
        (so it apples to errors as well).
      af9f7a23
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint · 216c4dd3
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
      
      
      client/mysql_upgrade.c:
        Auto merged
      216c4dd3
    • unknown's avatar
      Bug#29805 mysql_upgrade test fail if ~/.my.cnf contain a password · 6fdcb4c7
      unknown authored
       - "mysql" and "mysqlcheck" should not read defaults file
      
      
      client/mysql_upgrade.c:
        Instruct "mysql" and "mysqlcheck" that is invoked by "mysql_upgrade" not
        to read defaults file, they should get all the parameters they need from
        mysql_upgrade(that read the default file)
      6fdcb4c7
    • unknown's avatar
      Bug#30487 mysql_upgrade reports misleading errors · f237b984
      unknown authored
       - Update result file to include these "misleading errors", better to 
      run mysql_upgrade with them than not at all.
      
      
      mysql-test/r/mysql_upgrade.result:
        Update result file for mysql_upgrade after removing it's disabling
      f237b984
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 478fb4a1
      unknown authored
      into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
      
      
      478fb4a1
    • unknown's avatar
      Bug#30029 mysql_upgrade fails for 5.0 -> 5.1.21, 5.1.20 -> 5.1.21 upgrades · fd99a7da
      unknown authored
       - Change to use '' to quote a string inside another string
      
      
      scripts/mysql_system_tables.sql:
        Change to use '' to quote string inside another string
      fd99a7da
    • unknown's avatar
      recommit of Bug 25228 for 5.1.22: rpl_relayspace.test fails on powermacg5, vm-win2003-32-a · 9b49c3cb
      unknown authored
        
        A test case was waiting for a fixed number of seconds for a specific 
        state of the slave IO thread to take place.
        Fixed by waiting in a loop for that specific thread state instead 
        (or timeout).
      
      
      mysql-test/suite/rpl/t/rpl_relayspace.test:
        recommit of Bug 25228 for 5.1.22: fixed test case
      9b49c3cb
    • unknown's avatar
      Bug#28560 mysql_upgrade test links /usr/local/mysql/lib libraries · 234fe83d
      unknown authored
       - Remove disabling of mysql_upgrade
      
      
      mysql-test/t/disabled.def:
        Remove disabling of mysql_upgrade
      234fe83d
    • unknown's avatar
      recommit of Addendum to bug #29325 to 5.1.22 tree · 77808ac9
      unknown authored
      keep_files_on_create made a startup option
      
      
      77808ac9