1. 14 Nov, 2007 1 commit
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · d1d6920d
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      include/my_sys.h:
        Auto merged
      sql/CMakeLists.txt:
        Manual merge: Keep the workaround for the cmake 2.4.6 bug, enclose it in "if".
      d1d6920d
  2. 13 Nov, 2007 3 commits
    • unknown's avatar
      Bug#32091: Security breach via directory changes · b3a71e34
      unknown authored
      Post pushbuild fix
      
      Disabled test on windows due to bug#30459
      (DATA/INDEX DIR for partitions not working on windows)
      
      Patch from Mattias Jonsson.
      
      
      mysql-test/r/partition_mgm.result:
        Bug#32091: Security breach via directory changes
        
        fixed non-windows lines.
      mysql-test/t/partition_mgm.test:
        Bug#32091: Security breach via directory changes
        
        fixed non-windows lines.
      mysql-test/t/partition_symlink.test:
        Bug#32091: Security breach via directory changes
        
        Added no_windows, since it is affected of bug#30459
      b3a71e34
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines · dcfeb8f9
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.1-bug31210
      
      
      libmysqld/lib_sql.cc:
        Auto merged
      dcfeb8f9
    • unknown's avatar
      Bug#32078 - Excessive warnings: One can only use the --user switch · fca6284c
      unknown authored
                  if running as root
      
      Every start of a server in the test suite raised that warning.
      
      The cause was an unconditionla add of the --user option to the
      server command line. Only the "root" user (effective user id == 0)
      must use that option.
      
      Added check for effective user id == 0 before adding --user.
      
      Thanks to Magnus Svensson for the patch.
      
      
      mysql-test/mysql-test-run.pl:
        Bug#32078 - Excessive warnings: One can only use the --user switch
                    if running as root
        Added check for effective user id == 0 before adding --user
        in mysqld_arguments().
      fca6284c
  3. 12 Nov, 2007 23 commits
  4. 11 Nov, 2007 2 commits
    • unknown's avatar
      Bug#30695: An apostrophe ' in the comment of the ADD PARTITION · 7642ea9a
      unknown authored
          causes the Server to crash.
      
      Post-pushbuild fix
      
      Pushbuild genereted valgrind warnings.
      
      Changed function to safer variant.
      
      
      sql/sql_partition.cc:
        Bug#30695: An apostrophe ' in the comment of the ADD PARTITION
            causes the Server to crash.
        
        Fix for valgrind warning in pushbuild.
        String.c_prt fcn is not as safe as comment says.
        (gives valgrind errors in this case)
      7642ea9a
    • unknown's avatar
      Bug#31210 - INSERT DELAYED crashes server when used on · 076f2f73
      unknown authored
                    partitioned table
        
      Post-pushbuild fix
        
      Pushbuild detected a new need for lex initialization in
      embedded server.
      
      Fixed test for INSERT DELAYED in partitions_hash.test so that
      it works with embedded server.
      
      
      libmysqld/lib_sql.cc:
        Bug#31210 - INSERT DELAYED crashes server when used on
                        partitioned table
        Initialized lex for later use in open_table().
      mysql-test/r/partition_hash.result:
        Bug#31210 - INSERT DELAYED crashes server when used on
                        partitioned table
        Fixed test result for embedded server.
      mysql-test/t/partition_hash.test:
        Bug#31210 - INSERT DELAYED crashes server when used on
                        partitioned table
        Fixed test for embedded server.
      076f2f73
  5. 10 Nov, 2007 10 commits
    • unknown's avatar
      Bug#32091: Security breach via directory changes · da033604
      unknown authored
      Changed test case from GRANT to CREATE USER
      
      
      mysql-test/r/partition_mgm.result:
        Bug#32091: Security breach via directory changes
        test result
      mysql-test/t/partition_mgm.test:
        Bug#32091: Security breach via directory changes
        Changed test case from GRANT to CREATE USER
      da033604
    • unknown's avatar
      Bug#32091: Security breach via directory changes · e599005d
      unknown authored
      small fix of test case (when running make test after
      merge, it did not substitute MYSQLTEST_VARDIR in
      the error)
      
      
      mysql-test/r/partition_mgm.result:
        Bug#32091: Security breach via directory changes
        small fix in test result
      mysql-test/t/partition_mgm.test:
        Bug#32091: Security breach via directory changes
        small fix in test case
      e599005d
    • unknown's avatar
      Bug#31210 - INSERT DELAYED crashes server when used on · bb532df5
      unknown authored
                  partitioned table
      
      Post-merge fix
      
      A new need for lex initialization arose.
      
      
      sql/ha_ndbcluster.cc:
        Bug#31210 - INSERT DELAYED crashes server when used on
                    partitioned table
        Initialized lex for later use in open_table().
      bb532df5
    • unknown's avatar
      Bug#29368: Modified error messages · 8aa1c8b9
      unknown authored
      Problem: there was no standard syntax error when
               creating partitions with syntax error in
               the partitioning clause.
      
      Solution: added "Syntax error: " to the error message
      
      
      mysql-test/r/partition.result:
        Bug#29368: Incorrect error for syntax error when createing
                   partition
        
        test result update
      mysql-test/r/partition_error.result:
        Bug#29368: Incorrect error for syntax error when createing
                   partition
        
        test result
      mysql-test/t/partition_error.test:
        Bug#29368: Incorrect error for syntax error when createing
                   partition
        
        test case
      sql/share/errmsg.txt:
        Bug#29368: Incorrect error for syntax error when createing
                   partition
        
        Modified error messages
      8aa1c8b9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 4b1e7b75
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.1-bug31210
      
      
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_connect.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_servers.cc:
        Auto merged
      sql/sql_udf.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      4b1e7b75
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 · c244507b
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
      
      
      c244507b
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/build/51-fix · 7fce0f90
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
      
      
      include/my_sys.h:
        Auto merged
      7fce0f90
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50-fix · 836398b9
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
      
      
      836398b9
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50-fix · 3cbe9417
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/build/51-fix
      
      
      include/my_sys.h:
        Auto merged
      libmysql/CMakeLists.txt:
        Auto merged
      mysys/default.c:
        Manual merge
      3cbe9417
    • unknown's avatar
      Fix Windows build problems. · dae9042b
      unknown authored
      
      libmysql/CMakeLists.txt:
        Add new mysys/mf_arr_appstr.c source file
      mysys/default.c:
        Fix some bad code that caused warnings on Windows
      dae9042b
  6. 09 Nov, 2007 1 commit
    • unknown's avatar
      Bug#32091: Security breach via directory changes · 6ac3d502
      unknown authored
      Problem: the table's INDEX and DATA DIR was taken
        directly from the table's first partition.
        This allowed rename attack similar to
        bug#32111 when ALTER TABLE REMOVE PARTITIONING
      
      Solution: Silently ignore the INDEX/DATA DIR
        for the table. (Like some other storage engines
        do). 
        Partitioned tables do not support DATA/INDEX
        DIR on the table level, only on its partitions.
      
      
      mysql-test/r/partition_mgm.result:
        Bug#32091: Security breach via directory changes
        test result
      mysql-test/t/partition_mgm.test:
        Bug#32091: Security breach via directory changes
        test case
      sql/ha_partition.cc:
        Bug#32091: Security breach via directory changes
        
        Do not use the first partition's DATA/INDEX DIR
        as the table's DATA/INDEX DIR.
        (A partitioned table do not have support for DATA/
        INDEX DIR, only its partitions do)
      6ac3d502