1. 01 Mar, 2007 21 commits
  2. 28 Feb, 2007 19 commits
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · d5e983aa
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      d5e983aa
    • unknown's avatar
      Fixed compiler warnings. · def9c0b2
      unknown authored
      
      client/mysql_upgrade.c:
        Fixed problem with mysql_upgrade being dependent
        on local my.cnf files and problem with memory not being freed.
      client/mysqltest.c:
        Changed type to avoid warning.
      cmd-line-utils/readline/xmalloc.c:
        Fix to avoid warning.
      include/my_dbug.h:
        To disable parts from code in non-debug more.
      sql/field.cc:
        Fixed warning.
      sql/ha_archive.cc:
        Fixed warning.
      sql/ha_berkeley.cc:
        Added casts to avoid warnings.
      sql/ha_ndbcluster.cc:
        Fixed warnings.
      sql/log.cc:
        Added casts to avoid warnings.
      sql/slave.cc:
        Avoid warning.
      sql/sql_repl.cc:
        Avoid warning.
      support-files/compiler_warnings.supp:
        Added disabled warnings to compiler_warnings.supp file.
        These are backported mainly from 5.1 suppress file, but there
        are some additional new ones.
      def9c0b2
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/bug25074/my50-bug25074 · b9c36948
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      b9c36948
    • unknown's avatar
      Bug #25074 mysql_upgrade test can't give consistent results · 57af6dc4
      unknown authored
       - Tell the programs executed by mysql_upgrade to only read
        from the defaults file generated by msyql_upgrade
       - Fix memory leaks
      
      
      client/mysql_upgrade.c:
        - Always generate defaults file used for the programs executed
          by mysql_upgrade.
        - Set the executed programs to read options _only_ from the
          generated defaults file 
        - Add DBUG printouts
        - Add comments
        - Fix memory leaks
        - Change one 'my_delete'(delete a file) to 'my_free'(free memory)
        - Free memory allocated by 'load_default'
      57af6dc4
    • unknown's avatar
      Bug #20166 mysql-test-run.pl does not test system privilege tables creation · 890332a4
      unknown authored
       - No .sql files in mysql-test/lib/ anymore, don't copy them
      
      
      scripts/make_binary_distribution.sh:
        No need to copy mysql-test/lib/*.sql there are no sql files there anymore
      scripts/make_win_bin_dist:
        No need to copy mysql-test/lib/*.sql there are no sql files there anymore
      890332a4
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 6ffe8c8a
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      6ffe8c8a
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166 · 2a02f9c9
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/deleted/.del-init_db.sql:
        Auto merged
      BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
        Auto merged
      client/mysqltest.c:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      2a02f9c9
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 47a824ae
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/Makefile.am:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      BitKeeper/deleted/.del-init_db.sql:
        Auto merged
      BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
        Auto merged
      47a824ae
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/bug24878/my41-bug24878 · acdfc1e9
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
      
      
      acdfc1e9
    • unknown's avatar
      Bug#24878 mysql server doesn't log incident time in "mysqld got signal 11" error messages · 87eee8fc
      unknown authored
       - Add printout of current time when mysqld is killed by an
         unhandled signal
      
      
      sql/mysqld.cc:
        Add printout of current time before the "mysqld got signal %d" message
        Hopefully we don't crash in the calls to 'time' or 'localtime_r'
        but if that should start to happen we can move the printout of
        time further down. At least it's now below the check for segfault
        inside of segfault handler.
      87eee8fc
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · a2b4f529
      unknown authored
      into  mysql.com:/home/bar/mysql-5.0.b24478
      
      
      a2b4f529
    • unknown's avatar
      Bug#20166 mysql-test-run.pl does not test system privilege tables creation · b1988b0d
      unknown authored
       - Null merge 4.1 patch
      
      
      mysql-test/Makefile.am:
        Null merge to 4.1 patch
      scripts/Makefile.am:
        No need to clean mysql_create_system_tablesa anyomre
      b1988b0d
    • unknown's avatar
      Additional test changes for · 4a83cd38
      unknown authored
      Bug N 15126 character_set_database is not replicated (LOAD DATA INFILE need it)
      Positions of some binlog events were changed because of
      additional logging of @@collation_database.
      
      
      4a83cd38
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · d8fb19e1
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/deleted/.del-init_db.sql:
        Auto merged
      BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
        Auto merged
      client/mysqltest.c:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      d8fb19e1
    • unknown's avatar
      Bug#20166 mysql-test-run.pl does not test system privilege tables creation · 22cac737
      unknown authored
       - Build lib/init-db.sql from the output of mysql_create_system_tables
       - Remove mysql-test/init_db.sql and mysql-test/lib/init_db.sql
       - Leave netware/init_db.sql until 5.0 where we should soon have possibility
         to test with mysql-test-run.pl
      
      
      BitKeeper/deleted/.del-init_db.sql:
        Delete: mysql-test/init_db.sql
      BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
        Delete: mysql-test/lib/init_db.sql
      BitKeeper/etc/ignore:
        Added mysql-test/lib/init_db.sql to the ignore list
      mysql-test/Makefile.am:
        Build lib/init_db.sql from the output of mysql_create_system_tables
      22cac737
    • unknown's avatar
      After merge fix · 18f1d1a2
      unknown authored
      18f1d1a2
    • unknown's avatar
      Bug#20166 mysql-test-run.pl does not test system privilege tables creation · 838e89de
      unknown authored
       - Split out initial data in mysql_system_tables.sql to  it's own file
       - Use file from mysql_install_db and mysql-test-run
      
      
      scripts/mysql_system_tables_fix.sql:
        Rename: scripts/mysql_fix_privilege_tables.sql.in -> scripts/mysql_system_tables_fix.sql
      mysql-test/mysql-test-run.pl:
        - Add mysql_system_tables_data.sql as part of the bootstrap
        - Remove the addition of pid to end of bootstrap.sql, now
          to file used for bootstrap will be $opt_vardir/tmp/bootstrap.sql
        - Improve error message descibing how to find cause of a
          failed bootstrap
      scripts/Makefile.am:
        - Rename mysql_fix_privileg_tables.sql.in to mysql_system_tables_fix.sql
        - Build mysql_fix_privilege_tables from mysql_system_tables.sql and
          mysql_system_tables_fix.sql
        - Add mysql_system_tables_fix.sql to EXTRA_DIST
      scripts/mysql_install_db.sh:
        - Use mysql_system_tables_data.sql file when bootstrapping
          mysql, it will contain initial data for MysQL system tables
      scripts/mysql_system_tables.sql:
        Move initial data for system tables to it's own file
      scripts/mysql_system_tables_data.sql:
        Move initial data for system tables to it's own file
      838e89de
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · cfac9175
      unknown authored
      into  mysql.com:/home/ram/work/b25834/b25834.5.0
      
      
      cfac9175
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · de61d5b0
      unknown authored
      into  mysql.com:/home/bar/mysql-5.0.b15126
      
      
      sql/log_event.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/mysqlbinlog.result:
        After merge fix
      mysql-test/t/mysqlbinlog.test:
        After merge fix
      de61d5b0