1. 11 Feb, 2004 2 commits
  2. 10 Feb, 2004 21 commits
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 6b86e0eb
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1
      
      
      6b86e0eb
    • unknown's avatar
      Fix for prepared statements: · 38caa8c0
      unknown authored
      added setting of 'neg' in Item_param::set_time() (looks like the only forgotten
      member).
      It's the second place I find where 'neg' was forgotten.
      The symptom was unexpected negative times in the binary log when running
      tests/client_test.c (test_date() in fact):
      # at 43009
      #040210 15:46:42 server id 1  log_pos 43009     Query   thread_id=1     exec_time=0     error_code=0
      SET TIMESTAMP=1076424402;
      INSERT INTO test_date VALUES('2000-01-10 11:16:20','-11:16:20' etc
      
      
      sql/item.cc:
        Don't forget to copy 'neg'.
      38caa8c0
    • unknown's avatar
      Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · ce8c907f
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_2592/mysql-4.1
      
      
      ce8c907f
    • unknown's avatar
      code cleanup of processing MY_LEX_USER_VARIABLE_DELIMITER · 69651163
      unknown authored
      in sql/sql_lex.cc
      
      
      sql/sql_lex.cc:
        code cleanup of processing MY_LEX_USER_VARIABLE_DELIMITER
      69651163
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 23103e44
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1
      
      
      23103e44
    • unknown's avatar
      Another implementation of send_eof() cleanup · 98216bc9
      unknown authored
      98216bc9
    • unknown's avatar
      configure.in: · f709bc18
      unknown authored
        FreeBSD "ps" detection usually failed, in 90% cases,
        on FreeBSD-5.1. This change should work fine under
        5.x and 4.x, and I believe in 3.x. too. 
      
      
      configure.in:
        FreeBSD "ps" detection usually failed, in 90% cases. Thi
      f709bc18
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 86c161e6
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.2208
      
      
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      86c161e6
    • unknown's avatar
      Bug #2368 Multibyte charsets do not check that incoming data is well-formed · ad2c55b6
      unknown authored
      It was together with the previous but. This test tends to prove it.
      
      
      ad2c55b6
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 186ec6c7
      unknown authored
      into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
      
      
      186ec6c7
    • unknown's avatar
      Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 859aedb4
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_2592/mysql-4.1
      
      
      sql/sql_lex.cc:
        Auto merged
      859aedb4
    • unknown's avatar
      correcting mysql-test/r/mysqldump.result after merge · e4f3eb79
      unknown authored
      
      mysql-test/r/mysqldump.result:
        correcting result after merge
      e4f3eb79
    • unknown's avatar
      Merge · e711cc30
      unknown authored
      
      client/mysqldump.c:
        Auto merged
      mysql-test/r/mysqldump.result:
        e
      e711cc30
    • unknown's avatar
      added skiped newline to the end of file mysql-test/t/mysqldump.test · aaa35925
      unknown authored
      
      mysql-test/t/mysqldump.test:
        added skiped newline to the end of file
      aaa35925
    • unknown's avatar
      Follow-up of a discussion on dev-docs@ : · 757c8c8a
      unknown authored
      Don't show PSEUDO_THREAD_ID in SHOW VARIABLES because:
      - we don't want people to discover this variable as it could never do good to
      set it (it was designed for use by mysqlbinlog only, so that a thread can have
      several temp tables of the same name at the same time)
      - if we show it in SHOW VARIABLES, Mysql Administrator will display it and
      this will force us to put a description, so all MySQL Administrator user
      will be aware of this variable, some may have the idea to set it with a SET
      command, and then it will cause bad things.
      The variable is still settable, and still visible with SELECT @@.
      
      
      sql/set_var.cc:
        Don't show PSEUDO_THREAD_ID in SHOW VARIABLES because:
        - we don't want people to discover this variable as it could never do good to
        set it (it was designed for use by mysqlbinlog only, so that a thread can have
        several temp tables of the same name at the same time)
        - if we show it in SHOW VARIABLES, Mysql Administrator will display it and
        this will force us to put a description, so all MySQL Administrator user
        will be aware of this variable, some may have the idea to set it with a SET
        command, and then it will cause bad things.
        The variable is still settable, and still visible with SELECT @@.
      757c8c8a
    • unknown's avatar
      Wrong type of an argument was sent to my_printf_error(), which · dc792940
      unknown authored
      caused UDF functions to segmenation fault when they tried to
      print an error during wrong usage.
      
      
      dc792940
    • unknown's avatar
      An include was missing. · 4138b2ac
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      4138b2ac
    • unknown's avatar
      Fix for #2208 (multi-query returns wrong result in embedded library) · b4fc7c7f
      unknown authored
      now we execute only one first select during mysql_real_query
      others - during 'mysql_next_result'
      
      
      include/mysql.h:
        'virtual' next_result added
      libmysql/client_settings.h:
        cli_next_result declaration added
      libmysql/libmysql.c:
        mysql_next_result now works in embedded library as well
      libmysqld/lib_sql.cc:
        emb_next_result implemented
      sql/sql_class.h:
        fields to store the rest of the query added
      sql/sql_parse.cc:
        Saving the rest of the query added for embedded case
      b4fc7c7f
    • unknown's avatar
      http://bugs.mysql.com/bug.php?id=2368 · 102a9c6f
      unknown authored
      Multibyte charsets do not check that incoming data is well-formed
      
      
      102a9c6f
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 2282ec0f
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-derived2-4.1
      
      
      2282ec0f
    • unknown's avatar
      after merge & valgrind test fixes (BUG#2120) · ecb11989
      unknown authored
      
      sql/sql_derived.cc:
        memory leack fixed
      sql/sql_lex.cc:
        flag to avoid double cleaning
      sql/sql_lex.h:
        flag to avoid double cleaning
      sql/sql_select.cc:
        right way to cleanup JOIN_TAB
      sql/sql_select.h:
        right way to cleanup JOIN_TAB
      sql/sql_union.cc:
        flag to avoid double cleaning
      ecb11989
  3. 09 Feb, 2004 9 commits
    • unknown's avatar
      Fix for the rpl_until.test. · d5b3cb44
      unknown authored
      Don't use --command in tests; use command.
      
      
      mysql-test/r/rpl_until.result:
        result update
      mysql-test/t/rpl_until.test:
        real-sleep is incorrect syntax; mysqltest knows only real_sleep.
        Tip: don't use -- before commands; if mysqltest does not recognize the command
        after -- it just says "it must be a comment", so there is no syntax error detection.
        If you don't use the -- it will report the syntax error.
        The typo caused no sleep, so the slave did not have time to stop.
        Now it has time so we needn't replace the Slave_SQL_Running
        (and it's better to not replace it, because if we don't see that it
        is running, it will trigger errors just a bit later).
      d5b3cb44
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · da81724a
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-root
      
      
      da81724a
    • unknown's avatar
      switch off SERVER_MORE_RESULTS_EXISTS, but · c4d0631b
      unknown authored
      don't set other flags: it breaks future extensions
      
      
      c4d0631b
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · d4767576
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-derived2-4.1
      
      
      mysql-test/r/derived.result:
        Auto merged
      mysql-test/t/derived.test:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      d4767576
    • unknown's avatar
      Ensure that result from date_format() is binary · 74b81a80
      unknown authored
      Removed warnings from test suite
      
      
      mysql-test/r/ctype_utf8.result:
        Update results after fix of return argument from date_format()
      mysql-test/r/date_formats.result:
        Remove unnecessary warnings
      mysql-test/r/type_decimal.result:
        Remove unnecessary warnings
      mysql-test/r/warnings.result:
        Remove unnecessary warnings
      mysql-test/t/ctype_utf8.test:
        Fixed test
      mysql-test/t/date_formats.test:
        Remove unnecessary warnings
      mysql-test/t/type_decimal.test:
        Remove unnecessary warnings
      mysql-test/t/warnings.test:
        Remove unnecessary warnings
      sql/field.cc:
        Optimize
      sql/item_timefunc.cc:
        Ensure that result from date_format() is binary
      strings/ctype-simple.c:
        Better names for arguments
      74b81a80
    • unknown's avatar
      ufter revview fix (BUG#2120) · 61f0e69c
      unknown authored
      
      mysql-test/r/derived.result:
        test of error handling in derived tables with UPDATE & DELETE
      mysql-test/t/derived.test:
        test of error handling in derived tables with UPDATE & DELETE
      sql/mysql_priv.h:
        opened tables counter added to avoid loop of tables calculating in lock_tables
      sql/sql_acl.cc:
        opened tables counter added to avoid loop of tables calculating in lock_tables, here it is just for compatibility
      sql/sql_base.cc:
        removed unneeded assignment
        opened tables counter added to avoid loop of tables calculating in lock_tables
        commentary fixed
      sql/sql_derived.cc:
        mysql_derived made static
        variable res moved in place where it used
        priveleges written in correct place
      sql/sql_handler.cc:
        opened tables counter added to avoid loop of tables calculating in lock_tables
      sql/sql_parse.cc:
        mistyping in commentary fixed
      61f0e69c
    • unknown's avatar
      merge · 1c810278
      unknown authored
      1c810278
    • unknown's avatar
      Added --compact to mysqlbinlog · 35b1f544
      unknown authored
      Fixed output from mysqlbinlog when using --skip-comments
      Fixed warnings from valgrind
      Fixed ref_length when used with HEAP tables
      More efficent need_conversion()
      Fixed error handling in UPDATE with not updateable tables
      Fixed bug in null handling in CAST to signed/unsigned
      
      
      
      client/client_priv.h:
        cleanup & added OPT_COMPACT
      client/mysqldump.c:
        Added option --compact to get a compact readable dump.
        Ensure that SET CHARACTER_SET_CLIENT is not done if we have not remembered the old character set
        Print optimization comments even if --skip-comments are given as these are not true comments. (Before these where only printed at end, which was a bug)
      mysql-test/r/cast.result:
        More cast tests
      mysql-test/r/derived.result:
        Removed warnings
      mysql-test/r/mysqldump.result:
        Update results after fixing mysqlbinlog
      mysql-test/r/query_cache.result:
        Make test usable with --extern
        more tests
      mysql-test/r/rpl_until.result:
        Make test repeatable under valgrind
      mysql-test/r/sql_mode.result:
        Fix test result
      mysql-test/r/subselect.result:
        Make test smaller. Update wrong results
      mysql-test/t/cast.test:
        More cast tests
      mysql-test/t/derived.test:
        Removed warnings
      mysql-test/t/query_cache.test:
        Make test usable with --extern
        more tests
      mysql-test/t/rpl_until.test:
        fix for valgrind.  Becasue of unknown reason one got 'Slave_SQL_Running=yes' in this setup
      mysql-test/t/subselect.test:
        Make test case smaller
      sql/field.cc:
        Updated need_conversion() to use new arguments
      sql/ha_heap.cc:
        Moved initialization of ref_length to right place. This fixed problem that we had a ref_length of 8 for heap tables, which was not efficent.
      sql/item_func.cc:
        Cleanup
      sql/item_func.h:
        Fixed bug in null_handling for cast to signed/unsigned
      sql/item_strfunc.cc:
        Optimized/cleaned up Item_func_conv_charset3
      sql/item_sum.cc:
        Cleanup.
        Ensure that some flag variables are cleared in cleanup()
      sql/item_sum.h:
        Fixed references to uninitialized memory
      sql/opt_range.cc:
        Fixed spelling error
      sql/sql_class.cc:
        Fixed wrong return code, which could case protocol problems
      sql/sql_class.h:
        After merge fix
      sql/sql_prepare.cc:
        Added comments
      sql/sql_show.cc:
        Cleanup
      sql/sql_string.cc:
        Optimzed usage of need_conversion().
        - Removed not used argument
        - Save diff lenght in 'offset' to not have to recalculate length several times.
        Cleaned up comment
        Optimized copy_aligned() based on the knowledge that it's only called when you have wrong data
      sql/sql_string.h:
        Updated need_conversion() and copy_aligned() to use new arguments
      sql/sql_update.cc:
        Fixed error handling with non-updateable tables
      sql/sql_yacc.yy:
        Ensure that lex->lock_options are set correctly (to get rid of warnings from valgrind)
        Ensure that cast_type sets lex->charset and lex->length. Without these CONVERT() didn't work properly
      35b1f544
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 584ddfda
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-derived2-4.1
      
      
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      584ddfda
  4. 06 Feb, 2004 2 commits
    • unknown's avatar
      fixed bug #2592 mysqldump doesn't quote "tricky" names correctly · a54adfc3
      unknown authored
      
      mysql-test/r/mysqldump.result:
        added test for 
        bug #2592 mysqldump doesn't quote "tricky" names correctly
        please note, output's still looking wrong because of bug #2593
        it will be fixed when fix for bug #2593 will be pushed
      mysql-test/t/mysqldump.test:
        added test for bug 
        #2592 mysqldump doesn't quote "tricky" names correctly
      sql/sql_lex.cc:
        fixed processing of multibyte quoted variables
      a54adfc3
    • unknown's avatar
      Problem fix: · faa8a41b
      unknown authored
      http://bugs.mysql.com/bug.php?id=2366
      Wrong utf8 behaviour when data is trancated
      
      
      faa8a41b
  5. 05 Feb, 2004 5 commits
    • unknown's avatar
      merge · 44289ba6
      unknown authored
      
      mysql-test/r/subselect.result:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/opt_range.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      44289ba6
    • unknown's avatar
      Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · e5ab7070
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_2310/mysql-4.1
      
      
      e5ab7070
    • unknown's avatar
      code and comments cleanup · 04675623
      unknown authored
      04675623
    • unknown's avatar
      Added SQL_SELECT::cleanup() to make it easier to reuse SQL_SELECT item's for... · 0db0b601
      unknown authored
      Added SQL_SELECT::cleanup() to make it easier to reuse SQL_SELECT item's for sub selects. Needed for proper fix for bug #2479.
      Added 'select_to_file' class to be able to merge identical code for select_export and select_dump
      
      
      client/mysql.cc:
        Print mysql_insert_id() in 'status'
      mysys/charset.c:
        after merge fixup
      sql/item_func.cc:
        Code cleanup + new comments
      sql/opt_range.cc:
        Added SQL_SELECT::cleanup() to make it easier to reuse SQL_SELECT item's for sub selects.
      sql/opt_range.h:
        Added SQL_SELECT::cleanup() to make it easier to reuse SQL_SELECT item's for sub selects.
      sql/sql_class.cc:
        Added 'select_to_file' class to be able to merge identical code for select_export and select_dump
      sql/sql_class.h:
        Added 'select_to_file' class to be able to merge identical code for select_export and select_dump
      sql/sql_select.cc:
        Fixed bug when calling 'delete select' in sub selects. (Bug 2479)
        (Test case is already commited to global source repository)
      0db0b601
    • unknown's avatar
      Bug#2634 · 7b0ee22d
      unknown authored
        Emit "TYPE=" for 4.0 and 3.23 compatible modes
      
      
      mysql-test/r/mysqldump.result:
        Bug#2634
          New test case
      mysql-test/t/mysqldump.test:
        Bug#2634
          New test case
      7b0ee22d
  6. 04 Feb, 2004 1 commit