1. 04 Nov, 2003 9 commits
    • unknown's avatar
      Fixed access to uninitialized memory in protocol::store_time · 5a2e8356
      unknown authored
      
      BUILD/compile-pentium-valgrind-max:
        New attempt to avoid multiple warning
      mysql-test/mysql-test-run.sh:
        --valgrind-all now automaticly enables valgrind
      5a2e8356
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · efb99e73
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.1
      
      
      sql/sql_select.cc:
        Auto merged
      sql/unireg.cc:
        Auto merged
      efb99e73
    • unknown's avatar
      Removed some warnings reported by valgrind · 3b0d8e16
      unknown authored
      After merge fixes.
      Now code compiles, but there is still some valgrind warnings that needs to be fixed
      
      
      myisam/mi_rnext_same.c:
        handle case where rtree_find_next() returns an error
        (assume this means that there was no more keys)
      myisam/rt_index.c:
        Code cleanup
      mysql-test/r/func_crypt.result:
        Update results
      mysql-test/r/func_group.result:
        Update results
      mysql-test/r/null_key.result:
        Update results
      mysql-test/r/order_by.result:
        Update results
      mysql-test/r/query_cache.result:
        Update results
      mysql-test/r/range.result:
        Update results
      mysql-test/r/rpl_trunc_binlog.result:
        Update results
      mysql-test/t/fulltext.test:
        Fix error numbers
      mysql-test/t/func_crypt.test:
        Fixed test for 4.1
      mysql-test/t/range.test:
        Moved tests to be in sync with 4.0
      mysys/test_charset.c:
        Removed acccess to non existing functions
      sql-common/client.c:
        Merge fix
      sql/item_strfunc.cc:
        Simple code cleanup
        Don't call ->c_ptr() when you don't need a 0 terminated string
        (Causes warnings from valgrind)
      sql/log_event.cc:
        After merge fixes
      sql/protocol.cc:
        Change default catalog name to 'def'
      sql/spatial.cc:
        Code cleanup
      sql/sql_class.cc:
        After merge fixes
      sql/time.cc:
        Ensure that time object is cleared on error
      sql/unireg.cc:
        Removed warning reported by valgrind
      3b0d8e16
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · e678d1df
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-print_subselect-4.1
      
      
      sql/sql_select.cc:
        Auto merged
      e678d1df
    • unknown's avatar
      avoid problem when all tables are const · 10eaa32a
      unknown authored
      10eaa32a
    • unknown's avatar
      avoid problem when all tables are const · c3acf470
      unknown authored
      c3acf470
    • unknown's avatar
      fixed problem with UNION flags · 2406f38f
      unknown authored
      
      sql/sql_lex.h:
        removed unused flag
      sql/sql_union.cc:
        correct flag used
      2406f38f
    • unknown's avatar
      avoid writting junk · 6b765550
      unknown authored
      6b765550
    • unknown's avatar
      Merge with 4.0 · 54ef6c31
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      BitKeeper/deleted/.del-apply-patch:
        Delete: netware/BUILD/apply-patch
      BitKeeper/deleted/.del-save-patch:
        Delete: netware/BUILD/save-patch
      BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
        Auto merged
      BitKeeper/triggers/post-commit:
        Auto merged
      VC++Files/mysys/mysys.dsp:
        Auto merged
      client/mysqlbinlog.cc:
        Auto merged
      extra/resolveip.c:
        Auto merged
      include/config-win.h:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_sys.h:
        Auto merged
      include/mysql_com.h:
        Auto merged
      innobase/include/os0thread.h:
        Auto merged
      innobase/os/os0file.c:
        Auto merged
      innobase/srv/srv0start.c:
        Auto merged
      innobase/thr/thr0loc.c:
        Auto merged
      libmysql/manager.c:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      myisam/ft_boolean_search.c:
        Auto merged
      myisam/mi_extra.c:
        Auto merged
      myisam/mi_locking.c:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/fulltext.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/fulltext.test:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      mysql-test/t/rpl_reset_slave.test:
        Auto merged
      mysql-test/t/rpl_trunc_binlog.test:
        Auto merged
      mysys/Makefile.am:
        Auto merged
      mysys/errors.c:
        Auto merged
      mysys/my_symlink.c:
        Auto merged
      mysys/my_thr_init.c:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_test.cc:
        Auto merged
      sql/unireg.h:
        Auto merged
      client/mysqldump.c:
        merge with 4.0 (quoted names)
      configure.in:
        use local file
      include/my_pthread.h:
        Use local file
      innobase/include/srv0srv.h:
        Use local file
      innobase/row/row0sel.c:
        Use local file
      innobase/srv/srv0srv.c:
        Use local file
      libmysql/libmysql.c:
        Use local file
      myisam/myisamchk.c:
        merge fixes
      mysql-test/r/func_crypt.result:
        update results
      mysql-test/r/order_by.result:
        update results
      mysql-test/r/query_cache.result:
        update results
      mysql-test/r/range.result:
        update results
      mysql-test/r/rpl_reset_slave.result:
        update results
      mysql-test/r/rpl_trunc_binlog.result:
        update results
      mysql-test/t/func_crypt.test:
        Added disable_warnings/enable warnings
      mysql-test/t/query_cache.test:
        merge tests
      mysql-test/t/range.test:
        merge tests
      mysys/charset.c:
        use local file (will merge patch separately)
      sql/ha_innodb.cc:
        use local file
      sql/log_event.cc:
        new slave_proxy_id handling
      sql/slave.h:
        merge
      sql/sql_base.cc:
        merge
      sql/sql_parse.cc:
        Fixes for counting user connect resourses
        Added function comments for involved functions
      sql/sql_select.cc:
        Fix for not doing sort with LIMIT when OPTION_FOUND_ROWS is used
      sql/unireg.cc:
        merge fixes
      support-files/mysql.server.sh:
        merge fixes
      54ef6c31
  2. 03 Nov, 2003 19 commits
    • unknown's avatar
      Fixed typo in last changeset · 011b2aa7
      unknown authored
      011b2aa7
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0/ · 2458fa03
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.0
      
      2458fa03
    • unknown's avatar
      fixed a bug in boolean fts where a word queue was created based on... · 3d589199
      unknown authored
      fixed a bug in boolean fts where a word queue was created based on min_word_len, while with trunc* operator one could get shorter words
      
      
      3d589199
    • unknown's avatar
      Merge · 826df4a3
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      include/m_ctype.h:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/func_compress.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_create.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      strings/ctype-bin.c:
        Auto merged
      include/mysqld_error.h:
        Merge error messages
      mysql-test/r/date_formats.result:
        merge
      sql/derror.cc:
        Fixed wront return value
      sql/item_timefunc.cc:
        merge
      sql/item_timefunc.h:
        merge
      sql/mysqld.cc:
        merge
      sql/share/czech/errmsg.txt:
        Merge error messages
      sql/share/danish/errmsg.txt:
        Merge error messages
      sql/share/dutch/errmsg.txt:
        Merge error messages
      sql/share/english/errmsg.txt:
        Merge error messages
      sql/share/estonian/errmsg.txt:
        Merge error messages
      sql/share/french/errmsg.txt:
        Merge error messages
      sql/share/german/errmsg.txt:
        Merge error messages
      sql/share/greek/errmsg.txt:
        Merge error messages
      sql/share/hungarian/errmsg.txt:
        Merge error messages
      sql/share/italian/errmsg.txt:
        Merge error messages
      sql/share/japanese/errmsg.txt:
        Merge error messages
      sql/share/korean/errmsg.txt:
        Merge error messages
      sql/share/norwegian-ny/errmsg.txt:
        Merge error messages
      sql/share/norwegian/errmsg.txt:
        Merge error messages
      sql/share/polish/errmsg.txt:
        Merge error messages
      sql/share/portuguese/errmsg.txt:
        Merge error messages
      sql/share/romanian/errmsg.txt:
        Merge error messages
      sql/share/russian/errmsg.txt:
        Merge error messages
      sql/share/serbian/errmsg.txt:
        Merge error messages
      sql/share/slovak/errmsg.txt:
        Merge error messages
      sql/share/spanish/errmsg.txt:
        Merge error messages
      sql/share/swedish/errmsg.txt:
        Merge error messages
      sql/share/ukrainian/errmsg.txt:
        Merge error messages
      826df4a3
    • unknown's avatar
      Some simple things missing for last changeset · f9db1c24
      unknown authored
      
      BitKeeper/etc/ignore:
        added libmysqld/strfunc.cc
      mysql-test/t/overflow.test:
        Fix error messages
      sql/unireg.h:
        Add defines for allocation of DATE/TIME/DATETIME strings
      f9db1c24
    • unknown's avatar
      Merge mysql.com:/home/kostja/mysql/mysql-4.0-root · f234dded
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.0-1724
      
      f234dded
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 7018cf79
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-print_subselect-4.1
      
      
      sql/sql_select.cc:
        Auto merged
      7018cf79
    • unknown's avatar
      removed debug output · 0a1905d6
      unknown authored
      0a1905d6
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · e1eedaa4
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.0
      
      e1eedaa4
    • unknown's avatar
      When we delete the slave's temp tables from memory, we reset · e88de4b9
      unknown authored
      rli->save_temporary_tables and slave_open_temp_tables
      (in old 4.0 you could make "SHOW STATUS LIKE 'slave_open_temp_tables'" grow
      indefinitely by doing RESET SLAVE and replicating always the same CREATE
      TEMPORARY TABLE).
      It's critical to reset save_temporary_tables to 0 (otherwise you may later
      read memory which has been freed) so this changeset should go into 4.1.
      
      
      mysql-test/r/rpl_reset_slave.result:
        result update
      mysql-test/t/rpl_reset_slave.test:
        test for RESET SLAVE and creating twice the same temp table in the slave.
      sql/slave.cc:
        when we delete the slave's temp tables (when slave server shuts down and when
        RESET SLAVE), we reset 2 variables: rli->save_temporary_tables & slave_open_temp_tables.
      e88de4b9
    • unknown's avatar
      Many files: · 69dbdde1
      unknown authored
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      
      
      innobase/buf/buf0buf.c:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/dict/dict0crea.c:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/dict/dict0dict.c:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/fil/fil0fil.c:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/fsp/fsp0fsp.c:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/include/fil0fil.h:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/include/fsp0fsp.h:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/include/log0recv.h:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/include/mtr0log.h:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/include/mtr0mtr.h:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/include/os0file.h:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/include/ut0dbg.h:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/include/ut0ut.h:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/include/ha0ha.ic:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/include/mtr0log.ic:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/log/log0log.c:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/log/log0recv.c:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/mem/mem0pool.c:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/os/os0file.c:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/pars/lexyy.c:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/row/row0mysql.c:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/row/row0sel.c:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/srv/srv0srv.c:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/srv/srv0start.c:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/ut/ut0rnd.c:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      innobase/ut/ut0ut.c:
        Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
      69dbdde1
    • unknown's avatar
      fix for bug #1724 'WHERE ... IN() optimizer behaviour · 492802d6
      unknown authored
      has changed since 4.0.14'
      We need to calculate cost of RANGE
      scan if it is present instead of cost of 
      FULL scan.
      
      
      mysql-test/r/order_by.result:
        more accurate row estimation
        for RANGE scan
      mysql-test/r/range.result:
        added test case for bug #1724
        'WHERE ... IN() optimizer behaviour has changed since 4.0.14'
      mysql-test/r/select.result:
        please ignore
      mysql-test/t/range.test:
        added test case for bug #1724
        'WHERE ... IN() optimizer behaviour has changed since 4.0.14'
      sql/sql_select.cc:
        fix for bug #1724 'WHERE ... IN() optimizer behaviour 
        has changed since 4.0.14'
        We need to calculate cost of RANGE
        scan instead of cost of FULL scan
        if RANGE is present
        Few comments cleaned up.
      492802d6
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 32c22ce2
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.wl1279
      
      32c22ce2
    • unknown's avatar
      compatibility fixes · d35ba389
      unknown authored
      d35ba389
    • unknown's avatar
      WL #1279: Add table description to xml dump · 176ceca8
      unknown authored
      changes after montys review
      
      176ceca8
    • unknown's avatar
      Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_NAME error · 4563a476
      unknown authored
      Cleaned up (and disabled part of) date/time/datetime format patch. One can't anymore change default read/write date/time/formats.
      This is becasue the non standard datetime formats can't be compared as strings and MySQL does still a lot of datetime comparisons as strings
      Changed flag argument to str_to_TIME() and get_date() from bool to uint
      Removed THD from str_to_xxxx functions and Item class.
      Fixed core dump when doing --print-defaults
      Move some common string functions to strfunc.cc
      Dates as strings are now of type my_charset_bin instead of default_charset()
      Introduce IDENT_QUOTED to not have to create an extra copy of simple identifiers (all chars < 128)
      Removed xxx_FORMAT_TYPE enums and replaced them with the old TIMESTAMP_xxx enums
      Renamed some TIMESTAMP_xxx enums to more appropriate names
      Use defines instead of integers for date/time/datetime string lengths
      Added to build system and use the new my_strtoll10() function.
      
      
      
      BUILD/compile-pentium-valgrind-max:
        Remove double printing of warning
      VC++Files/libmysqld/libmysqld.dsp:
        Added strfunc.cc
      VC++Files/sql/mysqld.dsp:
        Added strfunc.cc
      VC++Files/sql/mysqldmax.dsp:
        Added strfunc.cc
      VC++Files/strings/strings.dsp:
        added my_strtoll10.c
      include/m_ctype.h:
        Removed MY_LEX_FOUND_IDENT (not used)
      include/m_string.h:
        Added my_strtoll10()
      include/mysqld_error.h:
        simplified 'wrong xxx name' error messages
      include/sql_state.h:
        simplified 'wrong xxx name' error messages
      libmysqld/Makefile.am:
        Added strfunc.cc
      mysql-test/mysql-test-run.sh:
        Simplified some options
        changed $@ to "$@" in an attempt to handle options with space (Didn't succeed;  Problem will disappear when mysql-test-run is rewritten in C)
      mysql-test/r/ctype_latin1_de.result:
        Added new tests
      mysql-test/r/ctype_recoding.result:
        Extended tests
      mysql-test/r/date_formats.result:
        Cleaned up tests
        Disabled some tests that can't yet be run
      mysql-test/r/func_compress.result:
        New error message
      mysql-test/r/rpl_temporary.result:
        Added new test
      mysql-test/t/create.test:
        Changed error numbers
      mysql-test/t/ctype_latin1_de.test:
        New tests
      mysql-test/t/ctype_recoding.test:
        Extended tests
      mysql-test/t/date_formats-master.opt:
        Removed datetime_format as we can't handle options with space in mysql-test-run
      mysql-test/t/date_formats.test:
        Cleaned up tests
        Disabled some tests that can't yet be run
      mysql-test/t/rpl_temporary.test:
        Added testing of open temporary table on slave shutdown
      mysql-test/t/symlink.test:
        Fixed error numbers
      mysys/default.c:
        Fixed core dump when doing --print-defaults
      sql/Makefile.am:
        Added strfunc.cc
      sql/derror.cc:
        Fixed compiler warning
      sql/field.cc:
        Changed argument to str_to_TIME() from bool to uint
        Removed THD argument from str_to_TIME()
        Moved find_enum() and find_set() to strfunc.cc
      sql/field.h:
        Changed type of last argument to get_date() to be able to handle more options
      sql/init.cc:
        Remove not used variable dayord
      sql/item.cc:
        Changed type of last argument to get_date() to be able to handle more options
        Removed THD* element from item.
        Don't use make_date_time() to generate date/time/datetimes
      sql/item.h:
        Changed type of last argument to get_date() to be able to handle more options
        Removed THD* from Item
      sql/item_create.cc:
        Indentation cleanup
      sql/item_func.cc:
        Use new find_type()
      sql/item_func.h:
        Changed type of last argument to get_date() to be able to handle more options
      sql/item_strfunc.h:
        space change
      sql/item_timefunc.cc:
        Changed month_names[] to be easier to use
        Moved check_names[] to strfunc.cc
        Added back old make_datetime() function
        Optimized extract_date_time()
        Use my_strtoll10() insetad of my_strntoll()
        Optimized make_date_time()
        Replaced short variable names with long ones.
        Use new functions make_time(), make_date() and make_datetime()
        Dates as strings are now of type my_charset_bin instead of default_charset()
        Changed Item_func_str_to_date() to by default return a date.
      sql/item_timefunc.h:
        Changed charset for date string from default_charset() to my_charset_bin
        Changed type of last argument to get_date() to be able to handle more options
        Use defines instead of integers for date/time/datetime string lengths
      sql/mysql_priv.h:
        Fixed/added new prototypes
      sql/mysqld.cc:
        Removed opt_datetime_format_names
        Cleaned up handling of date_time format handling. (Fixed core dump when mysqld had error on startup)
        Removed some unnecessary double init of collation variables
      sql/protocol.cc:
        Changed back protocol functions to always return dates in ISO format
      sql/set_var.cc:
        Added variables time_format, date_format and datetime_format
        This had to be recoded becasue checking was done in 'update' method and not in 'check' method.
      sql/set_var.h:
        Removed class sys_var_datetime_format() as this defined a variable (which doesn't work) instead of updating a variable
      sql/share/czech/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/danish/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/dutch/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/english/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/estonian/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/french/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/german/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/greek/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/hungarian/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/italian/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/japanese/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/korean/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/norwegian-ny/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/norwegian/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/polish/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/portuguese/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/romanian/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/russian/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/serbian/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/slovak/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/spanish/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/swedish/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/ukrainian/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/sql_base.cc:
        Use new find_type()
      sql/sql_class.cc:
        Allocate/free date_time format variables
      sql/sql_class.h:
        Define datetime_format variables
      sql/sql_db.cc:
        Use new ER_WRONG_NAME error
      sql/sql_lex.cc:
        Change lex to generate IDENT_QUOTED for quoted identifiers or identifers that are using characters > 128.
        This enabled us to not have to copy and convert the identifier to utf8 for simpe identifiers
      sql/sql_parse.cc:
        Use new ER_WRONG_NAME error
        Use new find_type() function
      sql/sql_prepare.cc:
        Use new defines
      sql/sql_table.cc:
        Use new ER_WRONG_NAME error
      sql/sql_yacc.yy:
        Don't copy and convert simple identifiers to utf8.
        Replace __FORMAT_TYPE defines with TIMESTAMP... defines
      sql/structs.h:
        Renamed DATETIME_FORMAT to DATE_TIME format to indicate that it's for date/time/datetime formats
        Renamed WRONT_TIMESTAMP_FULL to TIMESTAMP_DATETIME_ERROR and TIMESTAMP_FULL to TIMESTAMP_DATETIME
        Added KNOWN_DATE_TIME_FORMAT struct for Item_func_get_format
      sql/time.cc:
        Prepare str_to_TIME and str_to_time() for general date/time handling
        Removed THD from str_to... functions
        Renamed date/time/datetime functions to use 'date_time' instead of 'datetime'
        Added functions to make and copy DATE_TIME_FORMAT's
        Added trivial functions 'make_time()', 'make_date()' and 'make_datetime()'
      strings/Makefile.am:
        Added my_strtoll10()
      strings/ctype-bin.c:
        Cleared upper part of binary state map to be able to easily identify simple identifiers
      strings/my_vsnprintf.c:
        F
      4563a476
    • unknown's avatar
      after review fix · b6d6a5f4
      unknown authored
      b6d6a5f4
    • unknown's avatar
      after review fix · 6e13e423
      unknown authored
      
      mysql-test/r/func_str.result:
        new results
      sql/item.cc:
        charset changed
        printing string moved to String
      sql/item_cmpfunc.cc:
        new comparation class builder to avoid long switch
        new print_agrs used
      sql/item_cmpfunc.h:
        new comparation class builder to avoid long switch
      sql/item_func.cc:
        new print_agrs
      sql/item_func.h:
        new print_agrs
      sql/item_strfunc.cc:
        new print_agrs
      sql/item_subselect.cc:
        new comparation class builder to avoid long switch
      sql/item_subselect.h:
        new comparation class builder to avoid long switch
      sql/item_timefunc.cc:
        charset changed
      sql/mysql_priv.h:
        new comparation class builder to avoid long switch
      sql/mysqld.cc:
        new comparation class builder to avoid long switch
      sql/sql_parse.cc:
        new comparation class builder to avoid long switch
      sql/sql_string.cc:
        string printing moved to String class
      sql/sql_string.h:
        string printing moved to String class
      sql/sql_yacc.yy:
        birect class creation where it is possible
      6e13e423
    • unknown's avatar
      Merge · a171c33e
      unknown authored
      
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_subselect.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/item_subselect.cc:
        SCCS merged
      a171c33e
  3. 02 Nov, 2003 12 commits
    • unknown's avatar
      merge · 8bdd6c04
      unknown authored
      8bdd6c04
    • unknown's avatar
      fixed BUG#1645 · 31e42be6
      unknown authored
        all calls of fix_fields() are inspected
      (copy of cset which I lost in accidatly tree delete)
      
      
      mysql-test/r/subselect.result:
        test of BUG#1645
      mysql-test/t/subselect.test:
        test of BUG#1645
      sql/item_subselect.cc:
        removed passing left_expr through parameters, because it present in class fields
        fixed fix_fields() call
      sql/item_subselect.h:
        removed passing left_expr through parameters, because it present in class fields
      sql/set_var.cc:
        comments added
      sql/sql_select.cc:
        fixed BUG#1645 (thd can be used in fix_fields of subqueries)
      31e42be6
    • unknown's avatar
      aftermerge fix · 106ae8ed
      unknown authored
      106ae8ed
    • unknown's avatar
      after review fix · 975ecd99
      unknown authored
      
      mysql-test/t/subselect.test:
        ufter merge fix
      975ecd99
    • unknown's avatar
      Portability fix · 1f5d2372
      unknown authored
      1f5d2372
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · e2cc261f
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-errs-4.1
      
      
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      e2cc261f
    • unknown's avatar
      join_free now is method of JOIN and commented · f6e7570f
      unknown authored
      dependence should mean uncacheability
      
      
      sql/item_subselect.cc:
        dependence should mean uncacheability
      sql/sql_lex.cc:
        dependence should mean uncacheability
      sql/sql_select.cc:
        join_free now is method of JOIN and commented
      sql/sql_select.h:
        join_free now is method of JOIN
      f6e7570f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 3fa4399e
      unknown authored
      into mysql.com:/my/mysql-4.0
      
      3fa4399e
    • unknown's avatar
      Call my_sync() after all data is written to .frm file · 593c3449
      unknown authored
      Added my_sync() to mysys which will do fsync/fdatasync/_commit() on a file.
      
      
      VC++Files/mysys/mysys.dsp:
        Added my_sync.c
      configure.in:
        Added testing of fsync and fdatasync
      include/my_sys.h:
        Added my_sync()
      include/mysys_err.h:
        Added my_sync()
      isam/extra.c:
        Added my_sync()
      myisam/mi_extra.c:
        Added my_sync()
      myisam/mi_locking.c:
        Added my_sync()
      mysql-test/mysql-test-run.sh:
        Added option --valgrind-all
      mysys/Makefile.am:
        Added my_sync.c
      mysys/errors.c:
        Added my_sync()
      mysys/my_symlink.c:
        Removed compiler warning
      mysys/thr_alarm.c:
        Fix for link error on windows
      sql/unireg.cc:
        Call my_sync() after all data is written to .frm file
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      593c3449
    • unknown's avatar
      merge · 395971cb
      unknown authored
      395971cb
    • unknown's avatar
      BUG#1708 & other subselects with innodb tests · ff2f8b87
      unknown authored
      ff2f8b87
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · c75b42ee
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-like-4.1
      
      c75b42ee