An error occurred fetching the project authors.
  1. 09 Oct, 2006 1 commit
    • unknown's avatar
      Bug#8283 - OPTIMIZE TABLE causes data loss · 3109da77
      unknown authored
      OPTIMIZE TABLE with myisam_repair_threads > 1 performs a non-quick 
      parallel repair. This means that it does not only rebuild all 
      indexes, but also the data file.
      
      Non-quick parallel repair works so that there is one thread per 
      index. The first of the threads rebuilds also the new data file.
      
      The problem was that all threads shared the read io cache on the
      old data file. If there were holes (deleted records) in the table,
      the first thread skipped them, writing only contiguous, non-deleted
      records to the new data file. Then it built the new index so that
      its entries pointed to the correct record positions. But the other
      threads didn't know the new record positions, but put the positions
      from the old data file into the index.
      
      The new design is so that there is a shared io cache which is filled
      by the first thread (the data file writer) with the new contiguous
      records and read by the other threads. Now they know the new record
      positions.
      
      Another problem was that for the parallel repair of compressed
      tables a common bit_buff and rec_buff was used. I changed it so
      that thread specific buffers are used for parallel repair.
      
      A similar problem existed for checksum calculation. I made this
      multi-thread safe too.
      
      
      include/my_sys.h:
        Bug#8283 - OPTIMIZE TABLE causes data loss
        Redesign of io_cache_share.
      include/myisam.h:
        Bug#8283 - OPTIMIZE TABLE causes data loss
        Redesign of checksum calculation in mi_check.c.
        'calc_checksum' is now in myisamdef.h:st_mi_sort_param.
      myisam/mi_check.c:
        Bug#8283 - OPTIMIZE TABLE causes data loss
        Implemented a new parallel repair design.
        Using a synchronized shared read/write cache.
        Allowed for thread specific bit_buff, rec_buff, and calc_checksum.
      myisam/mi_open.c:
        Bug#8283 - OPTIMIZE TABLE causes data loss
        Added DBUG output.
      myisam/mi_packrec.c:
        Bug#8283 - OPTIMIZE TABLE causes data loss
        Allowed for thread specific bit_buff and rec_buff.
      myisam/myisamdef.h:
        Bug#8283 - OPTIMIZE TABLE causes data loss
        Commented on checksum calculation variables.
        Allowed for thread specific bit_buff.
        Added DBUG output for better table crash detection.
      myisam/sort.c:
        Bug#8283 - OPTIMIZE TABLE causes data loss
        Added implications of the new parallel repair design.
        Renamed 'info' -> 'sort_param'.
        Added DBUG output.
      mysql-test/r/myisam.result:
        Bug#8283 - OPTIMIZE TABLE causes data loss
        Added test results.
      mysql-test/t/myisam.test:
        Bug#8283 - OPTIMIZE TABLE causes data loss
        Added test cases.
      mysys/mf_iocache.c:
        Bug#8283 - OPTIMIZE TABLE causes data loss
        Redesign of io_cache_share.
        We do now allow a writer to synchronize himself with the
        readers of a shared cache. When all threads join in the lock,
        the writer copies the data from his write buffer to the shared
        read buffer.
      3109da77
  2. 06 Sep, 2006 1 commit
  3. 04 Sep, 2006 1 commit
    • unknown's avatar
      bug #12620 (UTF-8 indexing causes ER_NO_KEYFILE error) · e44024d4
      unknown authored
      The problem is that on some Mac OS X-es the file writing/reading
      call with zero bytes to read/write returns error.
      So here i try to eliminate that kinds of calls.
      
      
      myisam/mi_check.c:
        zero length copying avoided
      mysys/my_chsize.c:
        no file operations if it's not necessary
      e44024d4
  4. 28 Jun, 2006 1 commit
    • unknown's avatar
      Bug#17877 - Corrupted spatial index · 0b235009
      unknown authored
      CHECK TABLE could complain about a fully intact spatial index.
      A wrong comparison operator was used for table checking. 
      The result was that it checked for non-matching spatial keys. 
      This succeeded if at least two different keys were present, 
      but failed if only the matching key was present.
      
      I fixed the key comparison.
      
      
      myisam/mi_check.c:
        Bug#17877 - Corrupted spatial index
        Fixed the comparison operator for checking a spatial index.
        Using MBR_EQUAL | MBR_DATA to compare for equality and
        include the data pointer in the comparison. The latter
        finds the index entry that points to the current record.
        This is necessary for non-unique indexes.
        
        The old operator, SEARCH_SAME, is unknown to the rtree
        search functions and handled like MBR_DISJOINT.
      myisam/mi_key.c:
        Bug#17877 - Corrupted spatial index
        Added a missing DBUG_RETURN.
      myisam/rt_index.c:
        Bug#17877 - Corrupted spatial index
        Included the data pointer in the copy of the search key.
        This is necessary for searching the index entry that points
        to a specific record if the search_flag contains MBR_DATA.
      myisam/rt_mbr.c:
        Bug#17877 - Corrupted spatial index
        Extended the RT_CMP() macro with an assert for an 
        unexpected comparison operator.
      mysql-test/r/gis-rtree.result:
        Bug#17877 - Corrupted spatial index
        The test result.
      mysql-test/t/gis-rtree.test:
        Bug#17877 - Corrupted spatial index
        The test case.
      0b235009
  5. 10 Apr, 2006 1 commit
    • unknown's avatar
      Bug#10405 - myisamchk damages auto_increment columns when changing character set · d2f85640
      unknown authored
      Whenever 'myisamchk' needed to recreate a table,
      the auto increment information was lost.
      
      Now the forgotten element of the table creation
      information is set correctly.
      
      
      myisam/mi_check.c:
        Bug#10405 - myisamchk damages auto_increment columns when changing character set
        Added some DBUG statements.
        Enabled 'with_auto_increment' in 'create_info'
        when recreating a table.
      d2f85640
  6. 01 Nov, 2005 1 commit
    • unknown's avatar
      Review of new pushed code · fffe7417
      unknown authored
      Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
      Mark that add_time(), time_diff() and str_to_date() can return null values
      
      
      myisam/mi_check.c:
        keyoffset is not a position (no %lx here)
      mysql-test/r/func_sapdb.result:
        Fixed test after marking that timediff() can return NULL
      sql/item_func.cc:
        Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
      sql/item_timefunc.cc:
        Mark that add_time and str_to_date() can return null values
      sql/item_timefunc.h:
        Mark that time_diff can return 0
      sql/spatial.cc:
        Simple cleanups during review of new code
      fffe7417
  7. 25 Oct, 2005 1 commit
  8. 24 Oct, 2005 1 commit
    • unknown's avatar
      Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization · 8d6634c9
      unknown authored
      heap/_check.c:
        Change arguments to ha_key_cmp
      heap/hp_create.c:
        Change arguments to ha_key_cmp
      include/my_base.h:
        Remove SEARCH_RETURN_B_POS and instead always send an array to ha_key_cmp() as last argument
      myisam/mi_check.c:
        Change arguments to ha_key_cmp
      myisam/mi_rnext_same.c:
        Change arguments to ha_key_cmp
      myisam/mi_search.c:
        Change arguments to ha_key_cmp
      myisam/mi_write.c:
        Change arguments to ha_key_cmp
      myisammrg/myrg_queue.c:
        Change arguments to ha_key_cmp
      mysys/my_handler.c:
        Remove SEARCH_RETURN_B_POS and instead always send an array to ha_key_cmp() as last argument
        (This removes an if in a loop at the expensive of an int on the stack)
      sql/records.cc:
        Simplify new rr_index() code
        Create common error handling function for rr_() functions.
        Remove loop from rr_index() as handler::index_next() can never return HA_ERR_RECORD_DELETED
      sql/sql_load.cc:
        Simplify
      sql/sql_update.cc:
        Simplify code
        Fixed bug when one is updating an index column that could be used with ORDER BY
      sql/structs.h:
        Removed not needed structure element
      8d6634c9
  9. 22 Oct, 2005 1 commit
  10. 21 Oct, 2005 1 commit
    • unknown's avatar
      BUG#9622, stage 2, work together with fix for BUG#12232: · 71fdef4d
      unknown authored
      added "nulls_ignored" index statistics collection method for MyISAM tables.
      (notification trigger: this is about BUG#9622).
      
      
      include/my_base.h:
        BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method:
        Added SEARCH_RETURN_B_POS flag for ha_key_cmp()
      include/my_handler.h:
        BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method: added ha_find_null()
      include/myisam.h:
        BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.
      myisam/mi_check.c:
        BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method, added 
         mi_collect_stats_*(), updated update_key_parts() to deal with all 3 methods.
      myisam/myisamchk.c:
        BUG#9622: Added nulls_ignored index statistics collection method for MyISAM
      myisam/myisamdef.h:
        BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.
      myisam/sort.c:
        BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.
      mysql-test/r/myisam.result:
        Testcase for BUG9622
      mysql-test/t/myisam.test:
        Testcase for BUG9622
      mysys/my_handler.c:
        BUG#9622: ha_key_cmp() now supports new SEARCH_RETURN_B_POS flag, added ha_find_null()
      sql/ha_myisam.cc:
        BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.
      sql/mysqld.cc:
        BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.
      71fdef4d
  11. 23 Sep, 2005 1 commit
  12. 20 Sep, 2005 1 commit
    • unknown's avatar
      BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index · a2a8216b
      unknown authored
      statistics (like 4.0 did) (patch #3, with review #1 & #2 feedback addressed)
      
      
      include/myisam.h:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      myisam/mi_check.c:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      myisam/myisamchk.c:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      mysql-test/r/myisam.result:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      mysql-test/t/myisam.test:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/ha_myisam.cc:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/handler.h:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/mysqld.cc:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/set_var.cc:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/sql_class.h:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      a2a8216b
  13. 05 Sep, 2005 1 commit
    • unknown's avatar
      a fix (bug #4214: Table corruption with myisampack and large BLOB objects). · 943f8335
      unknown authored
      myisam/mi_check.c:
        a fix (bug #4214: Table corruption with myisampack and large BLOB objects).
        - pass version to the save_pack_length().
      myisam/mi_packrec.c:
        a fix (bug #4214: Table corruption with myisampack and large BLOB objects).
        - code cleanup: read_pack_length() and calc_pack_length() introduced, 
                        save_pack_length() modified: now the behavior depends on packing version
        - save packing version in the share->pack.version
        - pass it to the read_pack_length()
      myisam/mi_static.c:
        a fix (bug #4214: Table corruption with myisampack and large BLOB objects).
        - packing version set to 2
      myisam/myisamdef.h:
        a fix (bug #4214: Table corruption with myisampack and large BLOB objects).
        - packing version slot introduced (see MI_PACK)
      myisam/myisampack.c:
        a fix (bug #4214: Table corruption with myisampack and large BLOB objects).
        - code cleanup
        - pass version to the calc_pack_length() and save_pack_length()
      943f8335
  14. 09 Aug, 2005 1 commit
  15. 03 Jun, 2005 2 commits
    • unknown's avatar
      Bug #10901 · 26bd1582
      unknown authored
      After review fix
      Copy from internal state to share state only when in lock write
      mode (happens only when lock table x write has been performed since
      update_state_info is only called when holding a TL_READ_NO_INSERT
      lock normally. Previous patch would have failed in combination with
      delayed writes.
      
      
      26bd1582
    • unknown's avatar
      Bug #10901 · f956ecd0
      unknown authored
      Analyze table corrupts the state on
      data_file_length, records, index_file_length...
      by writing the shared state when there is an updated internal
      state due to inserts or deletes
      Fixed by synching the shared state with the internal state before
      writing it to disk
      Added test cases of 2 error cases and a normal case in new
      analyze test case
      
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      f956ecd0
  16. 13 May, 2005 1 commit
  17. 11 Apr, 2005 1 commit
  18. 03 Jan, 2005 1 commit
  19. 06 Dec, 2004 1 commit
  20. 12 Nov, 2004 1 commit
    • unknown's avatar
      After merge fixes · 55ae2e78
      unknown authored
      client/mysqldump.c:
        Merge with 4.0 (and reordering of options)
      client/mysqltest.c:
        Added DB as a user variable
      myisam/mi_check.c:
        Trivial cleanup
      mysql-test/r/grant.result:
        Move test to be in same order as in 4.0
      mysql-test/r/mix_innodb_myisam_binlog.result:
        Updated results
      mysql-test/r/ps_1general.result:
        Updated tests to work after privilege fixes
      mysql-test/r/timezone3.result:
        Updated results to 4.1
      mysql-test/t/ps_1general.test:
        Updated tests to work after privilege fixes
      sql-common/my_time.c:
        Applied sub-second patch from 4.0
      sql/sql_acl.cc:
        More debugging
      55ae2e78
  21. 11 Nov, 2004 1 commit
  22. 29 Oct, 2004 1 commit
  23. 22 Sep, 2004 1 commit
    • unknown's avatar
      Fix for BUG#4785: · 4063fd2c
      unknown authored
       * myisampack leaves key_file_length value from original table
       * myisamchk uses this value when calculating key file pointer length
      
      
      4063fd2c
  24. 03 Sep, 2004 1 commit
  25. 30 Aug, 2004 1 commit
    • unknown's avatar
      bug in my_strnncoll_utf8 (and friends) fixed · d8f416a2
      unknown authored
      cleanups
      better, charset-dependent, ft_max_len_for_sort value
      
      
      myisam/ftdefs.h:
        better ft_max_len_for_sort value
      myisam/mi_check.c:
        better, charset-dependent, ft_max_len_for_sort value
      myisam/myisamchk.c:
        unused value from enum removed
      myisam/sort.c:
        cleanup
      sql/mysql_priv.h:
        cleanup
      sql/mysqld.cc:
        cleanup
      sql/sql_acl.cc:
        cleanup
      sql/tztime.cc:
        cleanup
      strings/ctype-utf8.c:
        bug in my_strnncoll_utf8 (and friends) fixed
      d8f416a2
  26. 18 Jun, 2004 1 commit
    • unknown's avatar
      Fixed some byte order bugs with prepared statements on machines with high-byte-first. (Bug #4173) · 7d52eabb
      unknown authored
      Fixed problem with NULL and derived tables (Bug #4097)
      Cleanup of new pushed code
      
      
      BitKeeper/etc/ignore:
        added mysql-test/ndb/ndbcluster
      client/mysqltest.c:
        simple cleanup
      innobase/os/os0file.c:
        fix for netware
      libmysql/libmysql.c:
        Fixed some byte order bugs with prepared statements on machines with
        high-byte-first. (Bug #4173)
      myisam/ft_boolean_search.c:
        Comment cleanup
      myisam/mi_check.c:
        Removed not needed check (check is done in check_index())
      myisam/mi_unique.c:
        crc must be of type ha_checksum.
      myisam/myisamchk.c:
        Portability fix.
      mysql-test/mysql-test-run.sh:
        Simple cleanup
      mysql-test/r/subselect.result:
        Test problem with NULL and derived tables (Bug #4097)
      mysql-test/t/subselect.test:
        Test problem with NULL and derived tables (Bug #4097)
      sql/mysqld.cc:
        Remove not used defines
      sql/sql_select.cc:
        Fixed problem with NULL and derived tables (Bug #4097)
        Indentation fixes
      sql/sql_string.cc:
        Code cleanup
      sql/sql_yacc.yy:
        Allow one to use DROP PREPARE ...
      7d52eabb
  27. 04 Jun, 2004 1 commit
  28. 03 Jun, 2004 1 commit
    • unknown's avatar
      Fix skipp -> skip once and for all. · e6b4b304
      unknown authored
      (Note: This affects only comments, not variable names.)
      
      
      extra/perror.c:
        Fix skipp -> skip once and for all.
      heap/hp_hash.c:
        Fix skipp -> skip once and for all.
      isam/_dynrec.c:
        Fix skipp -> skip once and for all.
      isam/isamchk.c:
        Fix skipp -> skip once and for all.
      isam/isamlog.c:
        Fix skipp -> skip once and for all.
      isam/pack_isam.c:
        Fix skipp -> skip once and for all.
      isam/test1.c:
        Fix skipp -> skip once and for all.
      merge/mrg_open.c:
        Fix skipp -> skip once and for all.
      myisam/mi_check.c:
        Fix skipp -> skip once and for all.
      myisam/mi_delete.c:
        Fix skipp -> skip once and for all.
      myisam/mi_key.c:
        Fix skipp -> skip once and for all.
      myisam/mi_search.c:
        Fix skipp -> skip once and for all.
      myisam/myisamlog.c:
        Fix skipp -> skip once and for all.
      mysys/ChangeLog:
        Fix skipp -> skip once and for all.
      mysys/default.c:
        Fix skipp -> skip once and for all.
      mysys/mf_iocache.c:
        Fix skipp -> skip once and for all.
      mysys/mf_iocache2.c:
        Fix skipp -> skip once and for all.
      mysys/mf_pack.c:
        Fix skipp -> skip once and for all.
      mysys/mf_soundex.c:
        Fix skipp -> skip once and for all.
      mysys/mf_wfile.c:
        Fix skipp -> skip once and for all.
      mysys/my_error.c:
        Fix skipp -> skip once and for all.
      mysys/my_getwd.c:
        Fix skipp -> skip once and for all.
      scripts/mysql_find_rows.sh:
        Fix skipp -> skip once and for all.
      sql/sql_yacc.yy:
        Fix skipp -> skip once and for all.
      sql/time.cc:
        Fix skipp -> skip once and for all.
      strings/ctype-big5.c:
        Fix skipp -> skip once and for all.
      strings/ctype-gbk.c:
        Fix skipp -> skip once and for all.
      strings/ctype-tis620.c:
        Fix skipp -> skip once and for all.
      e6b4b304
  29. 23 May, 2004 1 commit
  30. 02 Apr, 2004 1 commit
  31. 25 Mar, 2004 1 commit
    • unknown's avatar
      BTREE-indexes in HEAP tables can now be used to optimize ORDER BY · 3c46af6c
      unknown authored
      Don't read character set files if we are using only the default charset. In most cases the user will not anymore get a warning about missing character set files
      Compare strings with space extend instead of space strip. Now the following comparisons holds:  "a" == "a " and "a\t" < "a". (Bug #3152).
      Note: Because of the above fix, one has to do a REPAIR on any table that has an ascii character < 32 last in a CHAR/VARCHAR/TEXT columns.
      
      
      heap/hp_hash.c:
        Comments and DBUG information
      include/my_handler.h:
        Updated prototype for mi_compare_text
      myisam/ft_boolean_search.c:
        Updated calls to mi_compare_text
      myisam/ft_nlq_search.c:
        Updated calls to mi_compare_text
      myisam/ft_parser.c:
        Updated calls to mi_compare_text
      myisam/ft_stopwords.c:
        Updated calls to mi_compare_text
      myisam/ft_update.c:
        Updated calls to mi_compare_text
      myisam/mi_check.c:
        Updated calls to mi_compare_text
      myisam/mi_search.c:
        Changed all string comparisons that removed end space to instead extend the shorter string with space
      myisam/mi_unique.c:
        Updated calls to mi_compare_text
      myisam/mi_write.c:
        Updated calls to mi_compare_text
      myisam/myisam_ftdump.c:
        Removed compiler warning
      mysql-test/r/ctype_collate.result:
        Fixed wrong result
      mysql-test/r/heap_btree.result:
        More tests
      mysql-test/t/heap_btree.test:
        more tests
      mysys/charset.c:
        Don't read charsets if we are only using default charset
        Don't require 'init_available_charsets' to succeed.
      mysys/my_handler.c:
        Compare strings with space extend instead of space strip
      mysys/tree.c:
        Fixed code to get better results for range optimzier
      sql/field.cc:
        Compare strings with space extend instead of space strip
      sql/filesort.cc:
        Compare strings with space extend instead of space strip
      sql/ha_heap.cc:
        Created bit map for keys that are using BTREE. This allows the optimzer to use BTREE's for sorting
      sql/ha_heap.h:
        Created bit map for keys that are using BTREE. This allows the optimzer to use BTREE's for sorting
      strings/ctype-big5.c:
        Compare strings with space extend instead of space strip
      strings/ctype-czech.c:
        Indentation cleanup. Should be fixed to use space extend
      strings/ctype-gbk.c:
        Compare strings with space extend instead of space strip
      strings/ctype-latin1.c:
        Compare strings with space extend instead of space strip
        Added missing my_hash_sort_latin1_de function
      strings/ctype-mb.c:
        For binary strings, don't remove end space when comparing
      strings/ctype-simple.c:
        Compare strings with space extend instead of space strip
      strings/ctype-sjis.c:
        Compare strings with space extend instead of space strip
      strings/ctype-tis620.c:
        Added comments that we should fix end space handling
      strings/ctype-ucs2.c:
        indentation fixes
      strings/ctype-utf8.c:
        Added comments that we should fix end space handling
      strings/ctype-win1250ch.c:
        Added comments that we should fix end space handling
      3c46af6c
  32. 24 Mar, 2004 1 commit
    • unknown's avatar
      Fix for #3067 · d94e4be3
      unknown authored
      Shouldn't be moved to 4.1
      
      
      myisam/mi_check.c:
        only set key_map if necessary
      d94e4be3
  33. 22 Mar, 2004 1 commit
  34. 17 Mar, 2004 1 commit
  35. 19 Feb, 2004 1 commit
    • unknown's avatar
      Fix for #2237 and #2490 (analyze and check for RTree keys) · 38042001
      unknown authored
      Now checking of the RTree keys works without errors.
      Worklog entry about appropriate checkup's routine for the RTree added
      
      
      myisam/mi_check.c:
        HA_SPATIAL checks added
      mysql-test/r/gis-rtree.result:
        Appropriate test resutl
      mysql-test/t/gis-rtree.test:
        test case
      38042001
  36. 16 Feb, 2004 1 commit
  37. 20 Jan, 2004 1 commit
  38. 12 Jan, 2004 1 commit
  39. 19 Dec, 2003 1 commit
    • unknown's avatar
      Fixes after merge with 4.0 · 9c2a63e3
      unknown authored
      Cleaned up embedded library access and query cache handling
      Changed min stack size to 128K (to allow longer MyISAM keys)
      Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
      
      
      client/mysqldump.c:
        Fixed bugs found after merge
      include/mysql_embed.h:
        Disable query cache when using embedded version
      myisam/mi_check.c:
        Removed not used variable
      mysql-test/r/auto_increment.result:
        Fixed bugs found after merge
      mysql-test/r/bdb.result:
        Fixed bugs found after merge
      mysql-test/r/func_group.result:
        Fixed bugs found after merge
      mysql-test/r/func_str.result:
        Fixed bugs found after merge
      mysql-test/r/func_time.result:
        Fixed bugs found after merge
      mysql-test/r/group_by.result:
        Fixed bugs found after merge
      mysql-test/r/innodb.result:
        Fixed bugs found after merge
      mysql-test/r/insert.result:
        Fixed bugs found after merge
      mysql-test/r/join_outer.result:
        Fixed bugs found after merge
      mysql-test/r/loaddata.result:
        Fixed bugs found after merge
      mysql-test/r/multi_update.result:
        Fixed bugs found after merge
      mysql-test/r/mysqldump.result:
        Update results
      mysql-test/r/rpl_EE_error.result:
        Fixed bugs found after merge
      mysql-test/r/rpl_multi_update.result:
        Fixed bugs found after merge
      mysql-test/r/symlink.result:
        Update results
      mysql-test/r/type_blob.result:
        Update results
      mysql-test/r/type_datetime.result:
        Update results
      mysql-test/r/type_decimal.result:
        Update results
      mysql-test/r/type_enum.result:
        Fixed bugs found after merge
      mysql-test/r/type_timestamp.result:
        Update results
      mysql-test/r/union.result:
        Update results
      mysql-test/r/warnings.result:
        Update results
      mysql-test/t/bdb.test:
        Fix test for 4.1
      mysql-test/t/innodb.test:
        Fix test for 4.1
      mysql-test/t/multi_update.test:
        Fix test for 4.1
      mysql-test/t/mysqldump.test:
        Fix test for 4.1
      mysql-test/t/rpl_EE_error.test:
        Fix test for 4.1
      mysql-test/t/rpl_multi_update.test:
        Fix test for 4.1
      mysql-test/t/union.test:
        Cleanup
      mysys/charset.c:
        Check results from my_once_alloc()
      mysys/my_handler.c:
        part of 4.0 merge
      sql-common/client.c:
        Part of 4.0 merge
      sql/field.cc:
        After merge fixes
      sql/field.h:
        After merge fixes
      sql/ha_innodb.cc:
        Remove duplicate include files
      sql/item.cc:
        Changed automatic int conversion to be of type binary
      sql/item.h:
        After merge fixes
      sql/item_func.cc:
        Changed automatic int conversion to be of type binary
      sql/item_func.h:
        After merge fixes
      sql/item_strfunc.cc:
        Added comments
      sql/item_subselect.cc:
        Indentation fixes
      sql/item_sum.cc:
        Changed automatic int conversion to be of type binary
      sql/item_sum.h:
        After merge fixes
      sql/mysql_priv.h:
        Cleanup embedded library access checks
      sql/mysqld.cc:
        Changed min stack size to 128K (to allow longer MyISAM keys)
      sql/set_var.cc:
        Fixed compiler warnings
      sql/share/czech/errmsg.txt:
        Better error message
      sql/share/danish/errmsg.txt:
        Better error message
      sql/share/dutch/errmsg.txt:
        Better error message
      sql/share/english/errmsg.txt:
        Better error message
      sql/share/estonian/errmsg.txt:
        Better error message
      sql/share/french/errmsg.txt:
        Better error message
      sql/share/greek/errmsg.txt:
        Better error message
      sql/share/hungarian/errmsg.txt:
        Better error message
      sql/share/italian/errmsg.txt:
        Better error message
      sql/share/japanese/errmsg.txt:
        Better error message
      sql/share/korean/errmsg.txt:
        Better error message
      sql/share/norwegian-ny/errmsg.txt:
        Better error message
      sql/share/norwegian/errmsg.txt:
        Better error message
      sql/share/polish/errmsg.txt:
        Better error message
      sql/share/romanian/errmsg.txt:
        Better error message
      sql/share/russian/errmsg.txt:
        Better error message
      sql/share/serbian/errmsg.txt:
        Better error message
      sql/share/slovak/errmsg.txt:
        Better error message
      sql/share/spanish/errmsg.txt:
        Better error message
      sql/share/swedish/errmsg.txt:
        Better error message
      sql/share/ukrainian/errmsg.txt:
        Better error message
      sql/sql_acl.h:
        Cleaned up embedded library acccess checks
      sql/sql_base.cc:
        After merge fixes
      sql/sql_client.cc:
        After merge fixes
      sql/sql_parse.cc:
        After merge fixes
        Changed access check code for embedded library (needed to make code shorter and ensure that check_table_access() is called)
        Recoded create-table handling for CREATE TABLE ... SELECT to make code shorter and faster
      sql/sql_prepare.cc:
        Add missing arguments
      sql/sql_select.cc:
        After merge fixes
      sql/sql_update.cc:
        After merge fixes
      sql/sql_yacc.yy:
        Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
      sql/table.cc:
        After merge fixes
      9c2a63e3