1. 11 Oct, 2007 1 commit
    • unknown's avatar
      Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1 · fb84f573
      unknown authored
      - Reserver namespace and place in frm for TABLE_CHECKSUM and PAGE_CHECKSUM create options
      - Added syncing of directory when creating .frm files
      - Portability fixes
      - Added missing cast that could cause bugs
      - Code cleanups
      - Made some bit functions inline
      - Moved things out of myisam.h to my_handler.h to make them more accessable
      - Renamed some myisam variables and defines to make them more globaly usable (as they are used outside of MyISAM)
      - Fixed bugs in error conditions
      - Use compiler time asserts instead of run time
      - Fixed indentation
      HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_PREPARE_FOR_DROP as the old name was wrong
      (Added a define for old value to ensure we don't break any old code)
      Added HA_EXTRA_PREPARE_FOR_RENAME as a signal for rename (before we used a DROP signal which is wrong)
      - Initialize error messages early to get better errors when mysqld or an engine fails to start
      - Fix windows bug that query_performance_frequency was not initialized if registry code failed
      - thread_stack -> my_thread_stack_size
      
      
      BitKeeper/etc/ignore:
        added libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc
      include/Makefile.am:
        Added my_bit.h
      include/m_string.h:
        Added bzero_if_purify() to simplify code
      include/my_base.h:
        Reserve options for the future
        Added HA_OPTION_NULL_FIELDS, HA_OPTION_PAGE_CHECKSUM, HA_CREATE_PAGE_CHECKSUM
        Added new error message HA_ERR_NEW_FILE
        Added optional new row type BLOCK_RECORD
        Renamed HA_EXTRA_PREPARE_FOR_DELETE to HA_EXTRA_PREPARE_FOR_DROP
        Added HA_EXTRA_PREARE_FOR_RENAME to inform handler we will do a rename
        (Added define to make things compatible until 6.0)
        Moved invalidator_by_filename form myisam.h
      include/my_dbug.h:
        Poirtablity fix
      include/my_global.h:
        Added helper macros STATIC_INLINE and MY_ERRPTR
        Added NEED_EXPLICIT_SYNC_DIR
      include/my_handler.h:
        Added missing casts
        Moved some constants and macros out from myisam.h to make these generally available
        Renamed mi_compare_text() to ha_compare_text() as this function is not myisam specific
        Renamed mi_portable_sizeof_char_ptr to portable_sizeof_char_ptr
        Added registering of handler messages for better error reporting during startup
      include/my_sys.h:
        Added my_sync_dir() and my_sync_dir_by_file()
        More comments
        Some indentation fixes
        Moved bit functions to my_bit.h
        Added prototype for crc32()
      include/myisam.h:
        Moved things from here to my_handler.h to make them more accessable
      libmysql/Makefile.shared:
        Added my_sync
      mysys/array.c:
        Fixed indentation and spelling errors
        Split set_dynamic() to two functions
        Added allocate_dynamic() as a new visiable function
        (no new code, only refactoring)
      mysys/mf_iocache.c:
        More DBUG
      mysys/mf_keycache.c:
        More explicite ASSERT
        Removed some casts
        Fixed indentation
      mysys/mf_tempfile.c:
        Fixed bug with possible dangling file descriptor
      mysys/my_atomic.c:
        Use compile time asserts instead of run time
      mysys/my_bit.c:
        Make most bit functions inline
      mysys/my_bitmap.c:
        Added my_bit.h
      mysys/my_compress.c:
        Fixed indentation
      mysys/my_create.c:
        Added my_sync_by_dir()
      mysys/my_delete.c:
        Added my_sync_by_dir()
      mysys/my_error.c:
        init_glob_errs() is now done in my_init()
      mysys/my_handler.c:
        mi_compare_text() -> ha_compare_text() as this is not MyISAM specific
        Added functions to initialize handler error messages
        Fixed indentation
        More clear usage of include files
      mysys/my_init.c:
        Added my_thread_stack_size to be used by other programs
        Ensure that global error messages are always initialized
        Fix windows bug that query_performance_frequency was not initialized if registry code failed
      mysys/my_open.c:
        More comments
        Removed duplicate code
      mysys/my_pread.c:
        Ensure that my_errno is set even if errno is 0
      mysys/my_realloc.c:
        Added comment
      mysys/my_rename.c:
        Added syncing of directories
      mysys/my_symlink.c:
        Added my_sync_by_dir()
      mysys/my_sync.c:
        Added my_sync_dir()
         
        On recent Mac OS X, fcntl(F_FULLFSYNC) is recommended over fsync()
        (see "man fsync" on Mac OS X 10.3).
        my_sync_dir(): to sync a directory after a file creation/deletion/
        renaming; can be called directly or via MY_SYNC_DIR in my_create/
        my_delete/my_rename(). No-op except on Linux (see "man fsync" on Linux).
        my_sync_dir_from_file(): same as above, just more practical when the
        caller has a file name but no directory name ready.
        Should the #warning even be a #error? I mean do we want to release
        binaries which don't guarantee any durability?
      mysys/safemalloc.c:
        Added sf_malloc_report_allocated() (Debugging aid)
      sql/gen_lex_hash.cc:
        Remove inline for big function
      sql/ha_partition.cc:
        HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_PREPARE_FOR_DROP
        prepare_for_delete -> prepare_for_rename() as this is the the time this function is called
      sql/ha_partition.h:
        prepare_for_delete -> prepare_for_rename() as this is the the time this function is called
      sql/handler.cc:
        ha_init_errors() is now called at startup before plugins
        This allows us to get better error messages
      sql/handler.h:
        Reserve enum value for Maria
        Add future proof enum for page checksums
      sql/item_func.cc:
        Include my_bit.h
      sql/lex.h:
        Added future proof CREATE table options
      sql/log.cc:
        Added comment
      sql/mysql_priv.h:
        thread_stack moved to mysys
      sql/mysqld.cc:
        thread_stack moved to mysys
        thread_stack -> my_thread_stack_size
        Initialize myisam key caches before plugins starts
        Initialize error to allow storage engine to give better error messages if init failes.
        Fixed indentation
        Group all MyISAM options together
        Added new status variable 'Opened_table_definitions' to allow one to monitor if table definition cache is too small
        Clarified some option help messages
      sql/opt_range.cc:
        Removed wrong usage of SAFE_MODE (this disabled key usage for UPDATES, which was never the intention)
        Removed print if total cost in a place where it didn't have any usable value
      sql/set_var.cc:
        thread_stack -> my_thread_stack
      sql/sql_class.cc:
        Intialize transaction object properly
      sql/sql_parse.cc:
        thread_stack -> my_thread_stack
      sql/sql_select.cc:
        Include my_bit.h
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      sql/sql_show.cc:
        Simplify handling of ha_choice variables
        Added future safe PAGE_CHECKSUM option
        Addid missing 'transactional=#' in information schema
      sql/sql_table.cc:
        HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_FORCE_REOPEN when doing reopen
        HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_PREPARE_FOR_RENAME when doing rename
        Removed not needed initialization
      sql/sql_test.cc:
        thread_stack -> my_thread_stack
      sql/sql_yacc.yy:
        Simplify handling of ha_choice variables
        Added future proof create table options TABLE_CHECKSUM=# & PAGE_CHECKSUM=#
      sql/table.cc:
        Save page_checksum in .frm
      sql/table.h:
        Added variable to hold create table option PAGE_CHECKSUM
      sql/unireg.cc:
        Added syncing of directories
      storage/myisam/ft_boolean_search.c:
        mi_compare_text() -> ha_compare_text()
      storage/myisam/ft_eval.c:
        mi_compare_text() -> ha_compare_text()
      storage/myisam/ft_nlq_search.c:
        mi_compare_text() -> ha_compare_text()
      storage/myisam/ft_parser.c:
        mi_compare_text() -> ha_compare_text()
      storage/myisam/ft_stopwords.c:
        mi_compare_text() -> ha_compare_text()
      storage/myisam/ft_test1.c:
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/myisam/ft_update.c:
        mi_compare_text() -> ha_compare_text()
      storage/myisam/ha_myisam.cc:
        Include my_bit.h
      storage/myisam/mi_check.c:
        MI_MAX_POSSIBLE_KEY_BUFF -> HA_MAX_POSSIBLE_KEY_BUFF
        mi_compare_text() -> ha_compare_text()
        Added BLOCK_RECORD to avoid compiler warnings
      storage/myisam/mi_checksum.c:
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/myisam/mi_create.c:
        MI_MAX_POSSIBLE_KEY -> HA_MAX_POSSIBLE_KEY
        MI_MAX_KEY_BLOCK_SIZE -> HA_MAX_KEY_BLOCK_SIZE
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/myisam/mi_dynrec.c:
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/myisam/mi_extra.c:
        HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_PREPARE_FOR_DROP
      storage/myisam/mi_open.c:
        MI_MAX_POSSIBLE_KEY -> HA_MAX_POSSIBLE_KEY
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/myisam/mi_packrec.c:
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/myisam/mi_range.c:
        mi_compare_text -> ha_compare_text
      storage/myisam/mi_test1.c:
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/myisam/mi_test2.c:
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/myisam/mi_unique.c:
        mi_compare_text() -> ha_compare_text()
      storage/myisam/mi_write.c:
        mi_compare_text() -> ha_compare_text()
      storage/myisam/myisamchk.c:
        Include my_bit.h
      storage/myisam/myisamdef.h:
        Moved store_key_length_inc to handler.h
      storage/myisam/myisampack.c:
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/myisam/sp_test.c:
        mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
      storage/myisammrg/ha_myisammrg.cc:
        HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_PREPARE_FOR_DROP
      include/my_bit.h:
        New BitKeeper file ``include/my_bit.h''
      fb84f573
  2. 07 Oct, 2007 1 commit
  3. 04 Oct, 2007 5 commits
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 03bef972
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      storage/ndb/test/ndbapi/testScanFilter.cpp:
        Auto merged
      03bef972
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · f4b6234c
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      f4b6234c
    • unknown's avatar
      Merge production.mysql.com:/usersnfs/jperkin/bk/build/5.0 · a006263f
      unknown authored
      into  production.mysql.com:/usersnfs/jperkin/bk/build/5.1
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      a006263f
    • unknown's avatar
      Merge production.mysql.com:/usersnfs/jperkin/bk/build/5.0 · 61e8c538
      unknown authored
      into  production.mysql.com:/usersnfs/jperkin/bk/bug-27692/5.0
      
      
      61e8c538
    • unknown's avatar
      Restore creation of test databases and the anonymous user which · 549cbcd5
      unknown authored
      were accidentally removed during a previous rototill of this
      code.  Fixes bug#27692.
        
      While it can be argued we should strive to provide a 'secure by
      default' installation, this happens to be the setup currently
      documented in the manual as the default, so defer changes that
      improve security out of the box to a co-ordinated effort later
      on.
        
      For now, make a note about the test databases and anonymous user
      in mysql_install_db and recommend that mysql_secure_installation
      be ran for users wishing to remove these defaults.
      
      [..re-commit of previously lost change..]
      
      
      scripts/mysql_system_tables_data.sql:
        Add anonymous accounts.
      scripts/mysql_install_db.sh:
        Point users at the mysql_secure_installation script.
      mysql-test/mysql-test-run.pl:
        Add a comment where removing anonymous users.
      549cbcd5
  4. 02 Oct, 2007 1 commit
    • unknown's avatar
      testScanFilter.cpp: · 019c20bf
      unknown authored
         Updated variable size arrays to use vector like Jonas did for 5.1 so that my build would not break
      
      
      ndb/test/ndbapi/testScanFilter.cpp:
         Updated variable size arrays to use vector like Jonas did for 5.1 so that my build would not break
      019c20bf
  5. 01 Oct, 2007 7 commits
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 88f1ad8c
      unknown authored
      into  mysql.com:/home/kent/bk/make-install/mysql-5.1-build
      
      
      88f1ad8c
    • unknown's avatar
      make_binary_distribution.sh: · ebc5495f
      unknown authored
        Added special handling of "mysql_install_db" and "mysql.server" scripts,
        find executables relative to the current directory.
      
      
      scripts/make_binary_distribution.sh:
        Added special handling of "mysql_install_db" and "mysql.server" scripts,
        find executables relative to the current directory.
      ebc5495f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 5b79e3c8
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      client/mysql_upgrade.c:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqlslap.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      sql/handler.cc:
        Auto merged
      5b79e3c8
    • unknown's avatar
      Removed extra spaces · 0741a4d1
      unknown authored
      Added extra debug
      
      
      client/mysql_upgrade.c:
        Removed extra space
      client/mysqlcheck.c:
        Removed extra space
      client/mysqldump.c:
        Removed extra space
      client/mysqlimport.c:
        Removed extra space
      client/mysqlshow.c:
        Removed extra space
      client/mysqlslap.c:
        Removed extra space
      client/mysqltest.c:
        Removed extra space
      sql/handler.cc:
        Added extra debug
      0741a4d1
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 0247dc1f
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        5.0 version change does not affect 5.1 - "use local".
      0247dc1f
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · c8cb61be
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      c8cb61be
    • unknown's avatar
      Fix bug#31150 "Test case does not cleanup": · 90a23c96
      unknown authored
      Add the cleanup by dropping the database 'track' in test "rpl_bug31076".
      
      
      mysql-test/suite/rpl/r/rpl_bug31076.result:
        Fix bug#31150 "Test case does not cleanup":
        Drop the database 'track' which was newly created for this test.
      mysql-test/suite/rpl/t/rpl_bug31076.test:
        Fix bug#31150 "Test case does not cleanup":
        Drop the database 'track' which was newly created for this test.
      90a23c96
  6. 29 Sep, 2007 4 commits
  7. 28 Sep, 2007 2 commits
    • unknown's avatar
      Merge trift2.:/MySQL/M51/clone-5.1 · ec90b2c5
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      This is mysql-5.1.22-rc.
      
      
      mysql-test/r/innodb_mysql.result:
        Auto merged
      scripts/mysqld_safe.sh:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/sql_select.cc:
        Manual merge - the 31001 bug is already fixed.
      mysql-test/include/mix1.inc:
        Manual merge - should not have conflicted at all.
      ec90b2c5
    • unknown's avatar
      Preliminary fix for · a38aaaec
      unknown authored
         Bug #30759  	mysql_install_db fails to set $extra_bindir properly in all cases.
      
      
      scripts/mysql_install_db.sh:
        Preliminary fix for
           Bug #30759  	mysql_install_db fails to set $extra_bindir properly in all cases.
        
        Provided by Daniel for the 5.1.22-rc build, to be superseded by a better patch when that is available.
      a38aaaec
  8. 27 Sep, 2007 10 commits
  9. 26 Sep, 2007 6 commits
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · f401917c
      unknown authored
      into  mysql.com:/home/kent/bk/make-install/mysql-5.1-build
      
      
      scripts/Makefile.am:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      f401917c
    • unknown's avatar
      make_binary_distribution.sh: · 16c09e69
      unknown authored
        Use 'make install' to create the package
      Makefile.am:
        Added 'pkgsuppdir' to control location separately
        Pass on mandir and infodir
        Don't install headers
      
      
      scripts/Makefile.am:
        Pass on mandir and infodir
      scripts/make_binary_distribution.sh:
        Use 'make install' to create the package
      support-files/Makefile.am:
        Added 'pkgsuppdir' to control location separately
      cmd-line-utils/readline/Makefile.am:
        Don't install headers
      cmd-line-utils/libedit/Makefile.am:
        Don't install headers
      16c09e69
    • unknown's avatar
      Makefile.am: · 4a0e561f
      unknown authored
        Corrected typo
      
      
      libmysql_r/Makefile.am:
        Corrected typo
      4a0e561f
    • unknown's avatar
      Raise version number after cloning 5.0.50 · adb1d7a3
      unknown authored
      adb1d7a3
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · d8352a39
      unknown authored
      into  mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build
      
      
      configure.in:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      d8352a39
    • unknown's avatar
      Makefile.am: · fb5f16f9
      unknown authored
        Always include all sub directories in "make dist"
        Removed incorrect comment
      configure.in:
        Unconditionally list make files in AC_CONFIG_FILES
        Removed 'thread_dirs', it is not used
        Minor cleanup
      compile-dist:
        Simplified the configure line needed for "make dist" to get it all
      zlib.m4, ssl.m4:
        Unconditionally list make files in AC_CONFIG_FILES
      Makefile.am:
        Removed DIST_SUBDIRS not needed
        Don't copy soft links as files into source package
      
      
      BUILD/compile-dist:
        Simplified the configure line needed for "make dist" to get it all
      config/ac-macros/ssl.m4:
        Unconditionally list make files in AC_CONFIG_FILES
      config/ac-macros/zlib.m4:
        Unconditionally list make files in AC_CONFIG_FILES
      libmysql/Makefile.am:
        Removed incorrect comment
      Makefile.am:
        Always include all sub directories in "make dist"
      mysql-test/Makefile.am:
        Removed DIST_SUBDIRS not needed
      libmysql_r/Makefile.am:
        Don't copy soft links as files into source package
      libmysqld/Makefile.am:
        Don't copy soft links as files into source package
      libmysqld/examples/Makefile.am:
        Don't copy soft links as files into source package
      sql/Makefile.am:
        Don't copy soft links as files into source package
      extra/Makefile.am:
        Always include all sub directories in "make dist"
      plugin/Makefile.am:
        Always include all sub directories in "make dist"
      configure.in:
        Unconditionally list make files in AC_CONFIG_FILES
        Removed 'thread_dirs', it is not used
        Minor cleanup
      fb5f16f9
  10. 25 Sep, 2007 3 commits