1. 19 Jul, 2005 4 commits
  2. 18 Jul, 2005 21 commits
    • unknown's avatar
      After-merge fixes. · 67f4acba
      unknown authored
      
      configure.in:
        A hack to ensure that the tree compiles on SuSE 9.0 with -ansi -pedantic
      mysql-test/r/olap.result:
        More post-merge fixes.
      mysql-test/r/rpl_log.result:
        Post-merge fixes. Guilhem: please investigate.
      mysql-test/r/rpl_rotate_logs.result:
        Post-merge fixes. Guilhem: please investigate.
      mysql-test/t/olap.test:
        A post-merge fix.
      67f4acba
    • unknown's avatar
      Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0 · 5ec61874
      unknown authored
      into  mysql.com:/Users/emurphy/src/work/mysql-5.0-bug11567
      
      5ec61874
    • unknown's avatar
      BUG#11567 Fixed binlog tests on windows. · 27cd8320
      unknown authored
      
      sql/log_event.cc:
        BUG#11567 - mysqlbinlog tests failing on Windows.
        Cast was not working as intended with Windows compiler,
        the value of option was being printed instead. Reason
        is that config-win.h has '#define bool BOOL', and on
        Windows BOOL is a typedef for int, which means
        that all casts to bool are really a cast to int. Changed
        to explicitly print a 1 or 0 instead of using cast.
      27cd8320
    • unknown's avatar
      Merge mysql.com:/home/kostja/mysql/mysql-4.1-root · 5c7b9db0
      unknown authored
      into  mysql.com:/home/kostja/mysql/mysql-5.0-merge
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/r/rpl_log.result:
        Auto merged
      mysql-test/r/rpl_rotate_logs.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/timezone_grant.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      mysql-test/t/timezone_grant.test:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      configure.in:
        Manual merge
      mysql-test/r/olap.result:
        Manual merge
      mysql-test/t/olap.test:
        Manual merge
      mysql-test/t/select.test:
        Manual merge
      sql/mysqld.cc:
        Manual merge
      sql/sql_parse.cc:
        Manual merge
      5c7b9db0
    • unknown's avatar
      Fixed the ucs2 -> eucjpms conversion bug (bug#11717) · 1ffb2d6d
      unknown authored
      
      mysql-test/r/ctype_eucjpms.result:
        Added test for the bug#11717
      mysql-test/t/ctype_eucjpms.test:
        Added test for the bug#11717
      strings/ctype-eucjpms.c:
        Fixed the ucs2 -> eucjpms conversion bug
      1ffb2d6d
    • unknown's avatar
      Fix BUILD/autorun.sh to really bail out on error. · 21697831
      unknown authored
      
      BUILD/autorun.sh:
        Make exit on error actually work.
      21697831
    • unknown's avatar
      Fixes to previous changeset · f7687523
      unknown authored
      get_defaults_file() -> get_defaults_options()
      
      
      include/my_sys.h:
        Remove deleted function
      libmysql/libmysql.def:
        get_defaults_file() -> get_defaults_options()
      libmysqld/libmysqld.def:
        get_defaults_file() -> get_defaults_options()
      f7687523
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2a860c06
      unknown authored
      into  mishka.local:/home/my/mysql-5.0
      
      
      client/mysqldump.c:
        Auto merged
      include/my_sys.h:
        Auto merged
      mysys/Makefile.am:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysys/default.c:
        SCCS merged
      2a860c06
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4bf28e8c
      unknown authored
      into moonbone.local:/work/mysql-5.0-bug-11482
      
      4bf28e8c
    • unknown's avatar
      Merge moonbone.local:/work/mysql-4.1-bug-11868 · d82ce308
      unknown authored
      into moonbone.local:/work/mysql-5.0-bug-11482
      
      
      mysql-test/r/update.result:
        Auto merged
      mysql-test/t/update.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      d82ce308
    • unknown's avatar
      Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 · 79aa1bc6
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
      
      79aa1bc6
    • unknown's avatar
      select.test: · 81eb0127
      unknown authored
        Changed test case comment to be more meaningful
      
      
      mysql-test/t/select.test:
        Changed test case comment to be more meaningful
      81eb0127
    • unknown's avatar
      Manual merge · 548bacd4
      unknown authored
      
      mysql-test/r/select.result:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      548bacd4
    • unknown's avatar
      Fix bug#11482 4.1.12 produces different resultset for a complex query · a77c2acf
      unknown authored
        than in previous 4.1.x
      
      Wrongly applied optimization were adding NOT NULL constraint which results in
      rejecting valid rows and reduced result set.
      
      The problem was that add_notnull_conds() while checking subquery were adding
      NOT NULL constraint to left joined table, to which, normally, optimization 
      don't have to be applied.
      
      
      sql/sql_select.cc:
        Fix bug #11482 Wrongly applied optimization was erroneously rejecting valid rows
        Constraint were added to optimization appliance test.
      mysql-test/t/select.test:
        Test case for bug #11482  Wrongly applied optimization was erroneously rejecting valid rows
      mysql-test/r/select.result:
        Test case for bug #11482  Wrongly applied optimization was erroneously rejecting valid rows
      a77c2acf
    • unknown's avatar
      Alleviate the autoconf requirement. · 85de918c
      unknown authored
      85de918c
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · c985a743
      unknown authored
      into production.mysql.com:/nfstmp1/guilhem/mysql-4.1-prod
      
      c985a743
    • unknown's avatar
      Fix for BUG#12003 "assertion failure in testsuite (double lock of · 47edc3fb
      unknown authored
       LOCK_thread_count)" and for BUG#12004 "SHOW BINARY LOGS reports 0
      for the size of all binlogs but the current one".
      There are a lot of 4.1->5.0 unmerged changes (hardest are in the optimizer), can't merge; still pushing in 4.1 because my changes 
      are very small. Feel free to ask me if you have problems merging them.
      
      
      mysql-test/r/rpl_log.result:
        correcting binlog sizes
      mysql-test/r/rpl_rotate_logs.result:
        correcting binlog sizes
      sql/mysqld.cc:
        don't lock LOCK_thread_count when you already have it
      sql/sql_repl.cc:
        my_open() needs the complete name, not only the base name
      47edc3fb
    • unknown's avatar
      Cleanups during review · 2e9d6d7e
      unknown authored
      Changed defaults option --instance to --defaults-group-suffix
      Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
      Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
      mysql_print_defaults now understands --defaults-group-suffix
      Remove usage of my_tempnam() (not safe function)
      if( -> if ( and while( to while (
      
      
      BitKeeper/deleted/.del-my_tempnam.c~a8562f15dad3012f:
        Delete: mysys/my_tempnam.c
      VC++Files/client/mysqlclient.dsp:
        Remove not used file my_tempnam.c
      VC++Files/client/mysqlclient_ia64.dsp:
        Remove not used file my_tempnam.c
      VC++Files/libmysql/libmysql.dsp:
        Remove not used file my_tempnam.c
      VC++Files/libmysql/libmysql_ia64.dsp:
        Remove not used file my_tempnam.c
      VC++Files/mysys/mysys.dsp:
        Remove not used file my_tempnam.c
      VC++Files/mysys/mysys_ia64.dsp:
        Remove not used file my_tempnam.c
      client/mysql.cc:
        Change to use get_defaults_options()
        Remove compiler warnings
      client/mysqldump.c:
        Indentation fixes
        Use quoted table name for 'primary_key_fields'
      extra/my_print_defaults.c:
        Add support for --defaults-group-suffix
        change to use get_default_options()
      extra/replace.c:
        Replace my_tempnam() with create_tmp_file() to allow us to remove my_tempnam.c
      include/config-win.h:
        Added DEFAULT_GROUP_SUFFIX_ENV
      include/my_sys.h:
        Change defaults_instance -> defaults_group_suffix
        Change get_defaults_files -> get_defaults_options
      libmysql/Makefile.shared:
        Added DEFAULT_GROUP_SUFFIX_ENV
      mysys/Makefile.am:
        Added DEFAULT_GROUP_SUFFIX_ENV
        Remove my_tempnam.c
      mysys/default.c:
        Changed --instance to --defaults-group-suffix
        Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX and moved the name to Makefile.am
        (mysys shouldn't by MySQL independent)
        Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
      mysys/default_modify.c:
        Optimized code to use allocated space more efficently
        Reduce code size
        Ensure that realloc() works independent of argument size
      mysys/my_bitmap.c:
        Added missing return
      sql/ha_innodb.cc:
        Change if( -> if (
      sql/ha_ndbcluster.cc:
        Change while( -> while (
      sql/item_cmpfunc.cc:
        Break loop early (simple optimization)
      sql/item_strfunc.cc:
        Change if( -> if (
      sql/log.cc:
        Fixed comment
      sql/mysqld.cc:
        Change if( -> if (
      sql/opt_range.cc:
        while( -> while (
        if( -> if (
      sql/parse_file.cc:
        Change if( -> if (
      sql/sql_cache.cc:
        while( -> while (
      sql/sql_parse.cc:
        Change if( -> if (
      sql/sql_prepare.cc:
        Added comment
      sql/sql_select.cc:
        while( -> while (
        Removed index variable by incrementing pointer
      sql/sql_show.cc:
        Change if( -> if (
      sql/sql_yacc.yy:
        Change if( -> if (
      tests/mysql_client_test.c:
        Added cast to first argument to bzero()
      2e9d6d7e
    • unknown's avatar
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7881e407
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      mysql-test/t/ctype_utf8.test:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      7881e407
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · d2e8bf2c
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      tests/mysql_client_test.c:
        Auto merged
      d2e8bf2c
  3. 17 Jul, 2005 5 commits
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9b1b56df
      unknown authored
      into  krsna.patg.net:/home/patg/mysql-5.0
      
      9b1b56df
    • unknown's avatar
      select.result, select.test: · bbee428d
      unknown authored
        Added a test case for bug #11745.
      sql_select.cc:
        Fixed bug # 11745.
        Added support of where clause for queries with FROM DUAL.
      sql_yacc.yy:
        Fixed bug # 11745.
        Added optional where clause for queries with FROM DUAL.
      
      
      sql/sql_yacc.yy:
        Fixed bug # 11745.
        Added optional where clause for queries with FROM DUAL.
      sql/sql_select.cc:
        Fixed bug # 11745.
        Added support of where clause for queries with FROM DUAL.
      mysql-test/t/select.test:
        Added a test case for bug #11745.
      mysql-test/r/select.result:
        Added a test case for bug #11745.
      bbee428d
    • unknown's avatar
      Federated Storage Engine, bug 9925 "Federated query processor (step 2 or step 3) not using logic in · 6743f0ee
      unknown authored
      WHERE statement"
      
      
      sql/ha_federated.cc:
        Changes per Jimw's review. 
        
        notes about some suggestions:
        
        1. Tried to replace my_sprintf with strxmov, but had problems. Couldn't 
           get the test suite to run at all, and could not find any particular
           error. Since this is something that is not critical, I'll leave it
           as is for now.
        2. I would like to use my_error to create all of my error messages, but 
           cannot figure out how to get it to take more than one argument to be
           passed to the error message (I tried this once but had errors, and 
           cannot find an example of how to get it to work despite seeing messages
           with obviously more than one arg
        3. Replaced all string building from literals to defined SQL string pieces
           such as "SELECT ", "FROM " ...
        4. Format fixes, spacing fixes completed
        5. Removed records_in_range records calculation functionality
      sql/ha_federated.h:
        Formatting changes, new defines for SQL query string tokens
      sql/share/errmsg.txt:
        changed 'SRC' to 'SOURCE' per Jimw's review
      6743f0ee
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · a8b81f72
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      
      sql/sql_select.cc:
        Auto merged
      a8b81f72
    • unknown's avatar
      func_in.result, func_in.test: · 653d467c
      unknown authored
        Fixed bug #11885.
      sql_select.cc:
        Fixed bug #11885.
        Predicates of the forms 'a IN (v)' 'a NOT IN (v)' now
        is replaced by 'a=v' and 'a<>v' at the parsing stage.
      sql_yacc.yy:
        Fixed bug #11885.
        Predicates of the forms 'a IN (v)' 'a NOT IN (v)' now 
        is replaced by 'a=v' and 'a<>v' at the parsing stage.
      
      
      sql/sql_yacc.yy:
        Fixed bug #11885.
        Predicates of the forms 'a IN (v)' 'a NOT IN (v) now 
        is replaced by 'a=v' and 'a<>v' at the parsing stage.
      sql/sql_select.cc:
        Fixed bug #11885.
        Predicates of the forms 'a IN (v)' 'a NOT IN (v) now
        is replaced by 'a=v' and 'a<>v' at the parsing stage.
      mysql-test/t/func_in.test:
        Fixed bug #11885.
      mysql-test/r/func_in.result:
        Fixed bug #11885.
      653d467c
  4. 16 Jul, 2005 10 commits
    • unknown's avatar
      opt_range.cc: · 4c52fb2e
      unknown authored
        Fixed bug #11853.
        Corrected the code of the range optimization for
        NOT IN and NOT BETWEEN.
      range.test, range.result:
        Fixed bug #11853.
      
      
      mysql-test/t/range.test:
        Fixed bug #11853.
      sql/opt_range.cc:
        Fixed bug #11853.
        Corrected the code of the range optimization for
        NOT IN and NOT BETWEEN.
      4c52fb2e
    • unknown's avatar
      After-merge fixes (4.1 -> 5.0). · 64efb147
      unknown authored
      
      mysql-test/r/sp.result:
        Test results fixed: rewritten test for Bug#6129
      mysql-test/r/view.result:
        Push a change to the result file from Sanja's patch.
      mysql-test/t/sp.test:
        Rewrite the test for Bug#6129 (now that stored procedures don't
        evaluate system variables at parse, the test produced different results).
        The old test failed with 1 in the second invocation (the old
        result was wrong).
      sql/item_func.cc:
        After-merge fix.
      sql/item_func.h:
        After-merge fix.
      sql/mysql_priv.h:
        After-merge fix.
      sql/mysqld.cc:
        Rollback the patch for Bug#7403 (it breaks the test suite).
      64efb147
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-4.1-root · f4c249a6
      unknown authored
      into  mysql.com:/media/sda1/mysql/mysql-5.0-merge
      
      
      mysql-test/r/select.result:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/ps.result:
        Manual merge (again).
      mysql-test/t/ps.test:
        Manual merge (again).
      mysql-test/t/select.test:
        Manual merge (again).
      sql/item_func.cc:
        Manual merge (again).
      sql/item_func.h:
        Manual merge (again).
      sql/set_var.h:
        Manual merge (again).
      f4c249a6
    • unknown's avatar
      Added test for Bug #11521 · 3fc69476
      unknown authored
      "Negative integer keys incorrectly substituted for 0 during range analysis."
      
      The problem is that the range optimizer incorrectly replaces any negative
      constant with '0' for all types except BIGINT because the method save_in_field()
      casts negative integers to non-negative. This causes incorrect query
      results where (0 = any_negative_number).
      
      The problem caused by this bug is fixed by the patch for BUG#11185.
      That patch constitutes an optimization due to which the problem code is
      never called with negative constants. This patch adds a test so we are sure
      that the problem does not reappear.
      
      
      mysql-test/r/select.result:
        Test for BUG#11521.
      mysql-test/t/select.test:
        Test for BUG#11521.
      3fc69476
    • unknown's avatar
      cs fixes · 3d5ff216
      unknown authored
      3d5ff216
    • unknown's avatar
      Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 · 174a7b90
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql-5.0
      
      
      tests/mysql_client_test.c:
        Auto merged
      174a7b90
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 01a1456f
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0
      
      01a1456f
    • unknown's avatar
      Restore previous used client charset in mysql_reconnect · e61a8c99
      unknown authored
      Moved mysql_set_character_set function to client.c
      Changed function prototype for mysql_set_character_set (as suggested
      by Konstantin)
      
      
      include/mysql.h:
        Changed function prototype
      libmysql/libmysql.c:
        moved mysql_set_character_set to client.c
      sql-common/client.c:
        moved mysql_set_character_set to client.c
      e61a8c99
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · 3a9ea232
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      3a9ea232
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · fdd9c510
      unknown authored
      into moonbone.local:/work/mysql-4.1-bug-11868
      
      fdd9c510