1. 24 Jun, 2004 1 commit
    • unknown's avatar
      - added mysql_tzinfo_to_sql to binary distributions · 4b055292
      unknown authored
      
      scripts/make_binary_distribution.sh:
         - added mysql_tzinfo_to_sql to binary distribution
      support-files/mysql.spec.sh:
         - added mysql_tzinfo_to_sql to the server subpackage
         - run "make clean" instead of "make distclean"
      4b055292
  2. 23 Jun, 2004 35 commits
    • unknown's avatar
      disabling the --innodb-safe-binlog option. It should be fixed to work with MyISAM too, · ff392bbe
      unknown authored
      before being available to users. That will be the case in 4.1.4.
      The "bk commit in mysqldoc" corresponding to this feature was not pushed.
      Removing the 6 tests, they'll be pushed again later.
      
      
      BitKeeper/deleted/.del-rpl_crash_binlog_ib_1a.result~c9ecac961121bd4e:
        Delete: mysql-test/r/rpl_crash_binlog_ib_1a.result
      BitKeeper/deleted/.del-rpl_crash_binlog_ib_1b.result~437e146cd203b120:
        Delete: mysql-test/r/rpl_crash_binlog_ib_1b.result
      BitKeeper/deleted/.del-rpl_crash_binlog_ib_2a.result~9a8bcdcc9218e280:
        Delete: mysql-test/r/rpl_crash_binlog_ib_2a.result
      BitKeeper/deleted/.del-rpl_crash_binlog_ib_2b.result~8d03dd3a2da8b228:
        Delete: mysql-test/r/rpl_crash_binlog_ib_2b.result
      BitKeeper/deleted/.del-rpl_crash_binlog_ib_3a.result~81a4b08a5259aef1:
        Delete: mysql-test/r/rpl_crash_binlog_ib_3a.result
      BitKeeper/deleted/.del-rpl_crash_binlog_ib_3b.result~ce5077d6b541e48c:
        Delete: mysql-test/r/rpl_crash_binlog_ib_3b.result
      BitKeeper/deleted/.del-rpl_crash_binlog_ib_1a-master.opt~f9cc9d326400bc96:
        Delete: mysql-test/t/rpl_crash_binlog_ib_1a-master.opt
      BitKeeper/deleted/.del-rpl_crash_binlog_ib_1a.test~ca1e5ae4b81c69ce:
        Delete: mysql-test/t/rpl_crash_binlog_ib_1a.test
      BitKeeper/deleted/.del-rpl_crash_binlog_ib_1b-master.opt~d8ad8b1c484b86c3:
        Delete: mysql-test/t/rpl_crash_binlog_ib_1b-master.opt
      BitKeeper/deleted/.del-rpl_crash_binlog_ib_1b.test~450096adbbe9214:
        Delete: mysql-test/t/rpl_crash_binlog_ib_1b.test
      BitKeeper/deleted/.del-rpl_crash_binlog_ib_2a-master.opt~d8e2c519c1a8d580:
        Delete: mysql-test/t/rpl_crash_binlog_ib_2a-master.opt
      BitKeeper/deleted/.del-rpl_crash_binlog_ib_2a.test~8a3a7646227ad59:
        Delete: mysql-test/t/rpl_crash_binlog_ib_2a.test
      BitKeeper/deleted/.del-rpl_crash_binlog_ib_2b-master.opt~5cb4dc88644cac71:
        Delete: mysql-test/t/rpl_crash_binlog_ib_2b-master.opt
      BitKeeper/deleted/.del-rpl_crash_binlog_ib_2b.test~95e00750688e5950:
        Delete: mysql-test/t/rpl_crash_binlog_ib_2b.test
      BitKeeper/deleted/.del-rpl_crash_binlog_ib_3a-master.opt~233787f10a34d70:
        Delete: mysql-test/t/rpl_crash_binlog_ib_3a-master.opt
      BitKeeper/deleted/.del-rpl_crash_binlog_ib_3a.test~c3cf56608fa38ab2:
        Delete: mysql-test/t/rpl_crash_binlog_ib_3a.test
      BitKeeper/deleted/.del-rpl_crash_binlog_ib_3b-master.opt~5a878d6ca9b620ba:
        Delete: mysql-test/t/rpl_crash_binlog_ib_3b-master.opt
      BitKeeper/deleted/.del-rpl_crash_binlog_ib_3b.test~d283dc272a38175:
        Delete: mysql-test/t/rpl_crash_binlog_ib_3b.test
      sql/mysqld.cc:
        disabling the --innodb-safe-binlog option. It should be fixed to work with MyISAM too,
        before being available to users. That will be the case in 4.1.4.
      ff392bbe
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 4ace0b9f
      unknown authored
      into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix
      
      
      4ace0b9f
    • unknown's avatar
      removing forgotten line (had not noticed as I build with LINT_INIT undefined :( ). · ffd6d12b
      unknown authored
      
      client/mysqltest.c:
        'res' does not exist here
      ffd6d12b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · d8d5bb8c
      unknown authored
      into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix
      
      
      d8d5bb8c
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 86e4a750
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-1717
      
      
      client/mysqltest.c:
        Auto merged
      innobase/trx/trx0sys.c:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      86e4a750
    • unknown's avatar
      WL#1717 "binlog/innodb consistency". · 424007ec
      unknown authored
      Final push. Printing some warnings at startup, as --innodb-safe-binlog requires
      some other options, to work as expected.
      Adding 6 new tests (3 pairs). If they fail on some platforms (so far they have been run only on my Linux),
      they should be ignored for the 4.1.3 build (you can just
      rm mysql-test/*/rpl_crash_*).
      Now going to update doc.
      
      
      mysql-test/misc/kill_master.sh:
        If the mysqld process has already gone away, 'kill' will fail, so we need to explicitely
        exit 0, so that the non-zero return code of kill does not make mysqltest stop.
      sql/log.cc:
        VC++ does not know (ulonglong)(-1)
      sql/mysqld.cc:
        When using --innodb-safe-binlog, some options need to automatically be turned on.
      424007ec
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · e0803cdc
      unknown authored
      into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix
      
      
      sql/tztime.cc:
        Auto merged
      e0803cdc
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · c6840712
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      c6840712
    • unknown's avatar
      followup · 2e137b19
      unknown authored
      2e137b19
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 4ce60f0f
      unknown authored
      into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix
      
      
      4ce60f0f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · efc33218
      unknown authored
      into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix
      
      
      sql/tztime.cc:
        Auto merged
      efc33218
    • unknown's avatar
      Fixed compilation on windows. · 8bfaf253
      unknown authored
      
      sql/tztime.cc:
        Fixed compilation on Windows.
        Added casts to avoid warnings.
        2nd argument of hash_search should be of type const byte *.
      8bfaf253
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · dc525227
      unknown authored
      into here.mwagner.org:/Volumes/BK/mysql-4.1
      
      
      dc525227
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 253e0a21
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      client/mysqldump.c:
        Auto merged
      configure.in:
        Auto merged
      sql/handler.cc:
        Auto merged
      253e0a21
    • unknown's avatar
      66bece20
    • unknown's avatar
      followup to handler cleanup · ebf9c723
      unknown authored
      
      mysql-test/r/bdb.result:
        bug#4000
      mysql-test/t/bdb.test:
        bug#4000
      sql/sql_select.cc:
        cleanup
      ebf9c723
    • unknown's avatar
      mysql-copyright: · bd000dd2
      unknown authored
        Fixed vim to expandtab's, retab'd code
        Fixed CWD bug in trim_the_fat()
      
      
      Build-tools/mysql-copyright:
        Fixed vim to expandtab's, retab'd code
        Fixed CWD bug in trim_the_fat()
      bd000dd2
    • unknown's avatar
      mysqldump.c: · 006a624c
      unknown authored
        Fix typo.
      
      
      client/mysqldump.c:
        Fix typo.
      006a624c
    • unknown's avatar
      mysql-copyright: · df1c95e3
      unknown authored
        Cleaned-up trim_the_fat()
      
      
      Build-tools/mysql-copyright:
        Cleaned-up trim_the_fat()
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      df1c95e3
    • unknown's avatar
      mysqldump.c: · e9b0e9bd
      unknown authored
        Correct the help text for mysqldump --set-charset option.
      
      
      client/mysqldump.c:
        Correct the help text for mysqldump --set-charset option.
      e9b0e9bd
    • unknown's avatar
      - using "--with-libedit" is sufficient (--without-readline throws · 763dc9e3
      unknown authored
         weird compile errors)
      
      
      Build-tools/Do-compile:
         - using "--with-libedit" is sufficient
      763dc9e3
    • unknown's avatar
      4603a7b3
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 931e0a14
      unknown authored
      into mysql.com:/usr/home/bar/mysql-4.1
      
      
      931e0a14
    • unknown's avatar
      configure.in: · b1eb0750
      unknown authored
        --with-charset=binary didn't really work after my previous change.
      
      
      configure.in:
        --with-charset=binary didn't really work after my previous change.
      b1eb0750
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 78dd958f
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      78dd958f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · b0993317
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      sql/ha_myisam.cc:
        Auto merged
      b0993317
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0755d56b
      unknown authored
      into mysql.com:/usr/home/bar/mysql-4.1
      
      
      0755d56b
    • unknown's avatar
    • unknown's avatar
      Fixed warning about unitialized mutex when mysqld couldn't start. · a3244c68
      unknown authored
      
      sql/handler.cc:
        Cleaned up comments
      a3244c68
    • unknown's avatar
      log.cc: · d02ddb59
      unknown authored
        rpl_charset failed on  Linux/AMD64.
      
      
      sql/log.cc:
        rpl_charset failed on  Linux/AMD64.
      d02ddb59
    • unknown's avatar
      merged · eb70dc55
      unknown authored
      
      configure.in:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      mysql-test/r/fulltext.result:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_help.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/unireg.cc:
        Auto merged
      eb70dc55
    • unknown's avatar
      handler interface cleanups: · 9a554b47
      unknown authored
        more logical table/index_flags
        return  HA_ERR_WRONG_COMMAND instead of abstract methods where appropriate
        max_keys and other limits renamed to max_supported_keys/etc
        max_keys/etc are now wrappers to max_supported_keys/etc 
        ha_index_init/ha_rnd_init/ha_index_end/ha_rnd_end are now wrappers to real {index,rnd}_{init,end} to enforce strict pairing
      
      
      include/myisam.h:
        increasing myisam_max_temp_file_length
      include/my_base.h:
        handler interface cleanup
      myisam/mi_static.c:
        warning removed
      mysql-test/Makefile.am:
        followup
      mysql-test/r/fulltext.result:
        fulltext indexes are not ordered
      mysql-test/r/rpl_user_variables.result:
        followup
      sql/field.cc:
        index_flags
      sql/filesort.cc:
        rnd_init -> ha_rnd_init
        rnd_end -> ha_rnd_end
      sql/ha_berkeley.cc:
        cleanup
      sql/ha_berkeley.h:
        table/index_flags revamped
      sql/ha_heap.cc:
        ensure index is accessed only after index_init (esp. important for temp tables)
      sql/ha_heap.h:
        table/index_flags revamped
      sql/ha_innodb.cc:
        don't workaround MySQL sloppiness
      sql/ha_innodb.h:
        table/index_flags revamped
      sql/ha_isam.h:
        table/index_flags revamped
      sql/ha_isammrg.h:
        table/index_flags revamped
      sql/ha_myisam.cc:
        ensure index is accessed only after index_init (esp. important for temp tables)
      sql/ha_myisam.h:
        table/index_flags revamped
      sql/ha_myisammrg.h:
        table/index_flags revamped
      sql/handler.cc:
        handler interface cleanups
      sql/handler.h:
        handler interface cleanups:
          more logical table/index_flags
          return  HA_ERR_WRONG_COMMAND instead of abstract methods
          max_keys and other limits renamed to max_supported_keys/etc
          max_keys/etc are now wrappers to max_supported_keys/etc 
          ha_index_init/ha_rnd_init/ha_index_end/ha_rnd_end are now wrappers to enforce strict pairing
      sql/item_subselect.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
      sql/lex.h:
        renamed to avoid conflicts
      sql/opt_range.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
        table/index_flags cleanup
      sql/opt_range.h:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
      sql/opt_sum.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
        table/index_flags cleanup
      sql/records.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
      sql/sql_acl.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
      sql/sql_cache.cc:
        cleanup
      sql/sql_delete.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
      sql/sql_handler.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
      sql/sql_help.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
      sql/sql_insert.cc:
        table/index_flags cleanup
      sql/sql_select.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
        table/index_flags cleanup
      sql/sql_table.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
        table/index_flags cleanup
      sql/sql_update.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
      sql/sql_yacc.yy:
        INDEX -> INDEX_SYM
      sql/table.cc:
        table/index_flags cleanup
      9a554b47
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 540121e1
      unknown authored
      into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-am
      
      
      540121e1
    • unknown's avatar
      Final solution to mysql_tzinfo_to_sql problem. · 0fe7f344
      unknown authored
      
      sql/Makefile.am:
        Final solution to mysql_tzinfo_to_sql problem:
        We can't put it in extra/ directory since it depends on sql/sql_yacc.h and
        sql/ directory depends on extra/comp_err. So this utility have to stay in
        sql/ for a while.
      BitKeeper/etc/ignore:
        Added sql/mysql_tzinfo_to_sql_tztime.cc to the ignore list
      0fe7f344
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 08af7307
      unknown authored
      into mysql.com:/home/pem/work/mysql-4.1
      
      
      08af7307
  3. 22 Jun, 2004 4 commits