1. 24 May, 2004 5 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · ec0ceed1
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      libmysqld/lib_sql.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      ec0ceed1
    • unknown's avatar
      After merge fixes · 406a5fa7
      unknown authored
      Remove compiler warnings
      Update windows project files
      
      
      VC++Files/innobase/innobase.dsp:
        Update project files after merge
      VC++Files/libmysqld/examples/test_libmysqld.dsp:
        Update project files after merge
      VC++Files/libmysqld/libmysqld.dsp:
        Update project files after merge
      VC++Files/myisamchk/myisamchk.dsp:
        Update project files after merge
      VC++Files/myisamlog/myisamlog.dsp:
        Update project files after merge
      VC++Files/myisampack/myisampack.dsp:
        Update project files after merge
      VC++Files/mysqldemb/mysqldemb.dsp:
        Update project files after merge
      VC++Files/sql/mysqld.dsp:
        Update project files after merge
      VC++Files/strings/strings.dsp:
        Update project files after merge
      innobase/include/data0data.ic:
        Fix compiler warning
      innobase/include/mem0pool.h:
        Remove reference to not existing variable (after merge fix)
      innobase/srv/srv0srv.c:
        Remove reference to not existing variable (after merge fix)
      libmysqld/libmysqld.def:
        Add function used by test programs
      mysql-test/r/func_str.result:
        After merge fixes
      mysql-test/r/variables.result:
        After merge fixes
      mysql-test/t/variables.test:
        After merge fixes
      sql/discover.cc:
        Remove not used lable
      sql/opt_range.cc:
        Removed compiler warnings
      strings/ctype-tis620.c:
        After merge fixes
      406a5fa7
    • unknown's avatar
      Fix of small syntax error - added missing backslash that prevented building of mysqlbinlog. · 11f36931
      unknown authored
      
      client/mysqlbinlog.cc:
        Added missing backslash that prevented building of mysqlbinlog.
      11f36931
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · ff80392e
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.3691
      
      
      sql/sql_db.cc:
        Auto merged
      ff80392e
    • unknown's avatar
      Fix for bug #3691 (libmysqld reports error 2 on CREATE DATABASE · f94e0386
      unknown authored
      but database is created)
      handling of CREATE DATABASE errors changed
      
      
      sql/sql_db.cc:
        now we check my_stat errors in mysql_create_db
      f94e0386
  2. 23 May, 2004 3 commits
  3. 22 May, 2004 1 commit
    • unknown's avatar
      Fix for bug which caused grant.test fail on darwin7.3. We were converting db and table · 0e86cf8a
      unknown authored
      names to lower case using latin1 instead of utf-8 in sql_acl.cc if lower_case_table_names 
      was on. Also replaced in other such places system_charset_info with files_charset_info
      for consistency.
      
      
      sql/handler.cc:
        Replaced system_charset_info with files_charset_info in places where we are converting 
        names to lower case because of lower_case_table_names for consistency.
      sql/sql_acl.cc:
        We should use files_charset_info when converting db/table names to lower case because they
        could be in utf-8 and not in latin1!
      sql/sql_cache.cc:
        Added clarifying comments in tricky place after discussion with Sanja.
        Replaced system_charset_info with files_charset_info in places where we 
        are converting names to lower case because of lower_case_table_names for 
        consistency.
      sql/sql_db.cc:
        Replaced system_charset_info with files_charset_info in places where we are converting 
        names to lower case because of lower_case_table_names for consistency.
      sql/sql_show.cc:
        Replaced system_charset_info with files_charset_info in places where we are converting 
        names to lower case because of lower_case_table_names for consistency.
      sql/sql_table.cc:
        Replaced system_charset_info with files_charset_info in places where we are converting 
        names to lower case because of lower_case_table_names for consistency.
      0e86cf8a
  4. 21 May, 2004 7 commits
  5. 20 May, 2004 5 commits
  6. 19 May, 2004 16 commits
    • unknown's avatar
      InnoDB cleanup: Remove unused functions ut_sprintf() and ut_fprintf() · a61ddac6
      unknown authored
      
      innobase/include/ut0ut.h:
        Remove unused functions ut_sprintf() and ut_fprintf()
      innobase/ut/ut0ut.c:
        Remove unused functions ut_sprintf() and ut_fprintf()
      a61ddac6
    • unknown's avatar
      Merge with 4.0, mainly to get changes to windows project files · 1d9fbbe3
      unknown authored
      
      
      VC++Files/client/mysqladmin.dsp:
        Auto merged
      VC++Files/client/mysqldump.dsp:
        Auto merged
      VC++Files/client/mysqlimport.dsp:
        Auto merged
      VC++Files/client/mysqlshow.dsp:
        Auto merged
      VC++Files/dbug/dbug.dsp:
        Auto merged
      VC++Files/heap/heap.dsp:
        Auto merged
      VC++Files/innobase/innobase.dsp:
        Auto merged
      VC++Files/isam/isam.dsp:
        Auto merged
      VC++Files/isamchk/isamchk.dsp:
        Auto merged
      VC++Files/libmysql/libmysql.dsp:
        Auto merged
      VC++Files/mysql.dsw:
        Auto merged
      BitKeeper/deleted/.del-sync0ipm.ic~2024167f6418de39:
        Auto merged
      VC++Files/libmysqltest/myTest.dsp:
        Auto merged
      VC++Files/merge/merge.dsp:
        Auto merged
      VC++Files/my_print_defaults/my_print_defaults.dsp:
        Auto merged
      VC++Files/myisam/myisam.dsp:
        Auto merged
      VC++Files/myisam_ftdump/myisam_ftdump.dsp:
        Auto merged
      VC++Files/myisammrg/myisammrg.dsp:
        Auto merged
      VC++Files/mysqlbinlog/mysqlbinlog.dsp:
        Auto merged
      VC++Files/mysqlcheck/mysqlcheck.dsp:
        Auto merged
      VC++Files/mysqlshutdown/mysqlshutdown.dsp:
        Auto merged
      VC++Files/mysqlwatch/mysqlwatch.dsp:
        Auto merged
      VC++Files/mysys/mysys.dsp:
        Auto merged
      VC++Files/pack_isam/pack_isam.dsp:
        Auto merged
      VC++Files/perror/perror.dsp:
        Auto merged
      VC++Files/regex/regex.dsp:
        Auto merged
      VC++Files/replace/replace.dsp:
        Auto merged
      VC++Files/test1/test1.dsp:
        Auto merged
      VC++Files/thr_test/thr_test.dsp:
        Auto merged
      VC++Files/vio/vio.dsp:
        Auto merged
      VC++Files/zlib/zlib.dsp:
        Auto merged
      extra/my_print_defaults.c:
        Auto merged
      include/m_string.h:
        Auto merged
      include/mysql_embed.h:
        Auto merged
      include/mysql_version.h.in:
        Auto merged
      innobase/dict/dict0dict.c:
        Auto merged
      innobase/mem/mem0pool.c:
        Auto merged
      innobase/srv/srv0srv.c:
        Auto merged
      innobase/trx/trx0sys.c:
        Auto merged
      myisam/myisam_ftdump.c:
        Auto merged
      VC++Files/bdb/bdb.dsp:
        Merge with 4.0
      VC++Files/client/mysql.dsp:
        Merge with 4.0
      VC++Files/client/mysqlclient.dsp:
        Merge with 4.0
      VC++Files/comp_err/comp_err.dsp:
        Merge with 4.0
      VC++Files/libmysqld/examples/test_libmysqld.dsp:
        Merge with 4.0
      VC++Files/libmysqld/libmysqld.dsp:
        Merge with 4.0
      VC++Files/myisamchk/myisamchk.dsp:
        Merge with 4.0
      VC++Files/myisamlog/myisamlog.dsp:
        Merge with 4.0
      VC++Files/myisampack/myisampack.dsp:
        Merge with 4.0
      VC++Files/mysqldemb/mysqldemb.dsp:
        Merge with 4.0
      VC++Files/mysqlserver/mysqlserver.dsp:
        Merge with 4.0
      VC++Files/sql/mysqld.dsp:
        Merge with 4.0
      VC++Files/strings/strings.dsp:
        Merge with 4.0
      libmysqld/lib_sql.cc:
        Merge with 4.0
      libmysqld/libmysqld.def:
        Merge with 4.0
      mysql-test/r/func_str.result:
        Merge with 4.0
      mysql-test/r/handler.result:
        auto
      mysql-test/r/variables.result:
        Merge with 4.0
      mysql-test/t/func_str.test:
        auto
      mysql-test/t/handler.test:
        auto
      mysql-test/t/variables.test:
        Merge with 4.0
      scripts/make_win_src_distribution.sh:
        auto
      scripts/mysql_install_db.sh:
        Use original file
      sql/Makefile.am:
        Merge with 4.0
      sql/ha_innodb.cc:
        auto
      sql/item_strfunc.cc:
        Merge with 4.0
      sql/mysql_priv.h:
        auto
      sql/mysqld.cc:
        Merge with 4.0
      sql/set_var.cc:
        Merge with 4.0
      sql/slave.cc:
        auto
      sql/sql_class.h:
        auto
      sql/sql_handler.cc:
        Merge with 4.0
      strings/ctype-tis620.c:
        Merge with 4.0
      1d9fbbe3
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0 · 32f2ecd4
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.0-root
      
      
      32f2ecd4
    • unknown's avatar
      after merge fix · a63184a6
      unknown authored
      
      sql/sql_union.cc:
        describe should go until the end
      a63184a6
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · efcb7706
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1
      
      
      mysql-test/r/func_encrypt.result:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      efcb7706
    • unknown's avatar
      after review changes · 9fb55cef
      unknown authored
      
      mysql-test/r/derived.result:
        explain of hidden subselect changed according to review
      mysql-test/r/subselect.result:
        explain of hidden subselect changed according to review
      mysql-test/r/union.result:
        explain of hidden subselect changed according to review
      sql/sql_class.h:
        we bo not need sign for now
      sql/sql_lex.h:
        we do not need sign for now
      9fb55cef
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 6e8252a5
      unknown authored
      into mysql.com:/home/my/mysql-4.0
      
      
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      6e8252a5
    • unknown's avatar
      Moved testing of binlog_cache_use/binlog_cache_disk_use statistical variables from · 707bd523
      unknown authored
      rpl_relayrotate.test to innodb.test since this test requires innodb support.
      
      
      mysql-test/t/innodb-master.opt:
        Rename: mysql-test/t/rpl_relayrotate-master.opt -> mysql-test/t/innodb-master.opt
      707bd523
    • unknown's avatar
      Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' · 2d67f1e0
      unknown authored
      Ensured that all projects compile
      Removed compiler warnings
      Better setting of server_version variable.
      Fix that make_win_src_distribution creates the privilege tables.
      
      
      VC++Files/bdb/bdb.dsp:
        Small, automatic changes
      VC++Files/client/mysql.dsp:
        Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
      VC++Files/client/mysqladmin.dsp:
        Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
      VC++Files/client/mysqlclient.dsp:
        Removed files that should only be used with mysql command line client
      VC++Files/client/mysqldump.dsp:
        Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
      VC++Files/client/mysqlimport.dsp:
        Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
      VC++Files/client/mysqlshow.dsp:
        Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
      VC++Files/comp_err/comp_err.dsp:
        Automatic changes
      VC++Files/dbug/dbug.dsp:
        Automatic changes
      VC++Files/heap/heap.dsp:
        automatic changes
      VC++Files/innobase/innobase.dsp:
        Automatic changes
      VC++Files/isam/isam.dsp:
        Automatic changes
      VC++Files/isamchk/isamchk.dsp:
        Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
      VC++Files/libmysql/libmysql.dsp:
        Automatic changes
      VC++Files/libmysqld/examples/test_libmysqld.dsp:
        Add missing files
      VC++Files/libmysqld/libmysqld.dsp:
        Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
      VC++Files/libmysqltest/myTest.dsp:
        Automatic changes
      VC++Files/merge/merge.dsp:
        Automatic changes
      VC++Files/my_print_defaults/my_print_defaults.dsp:
        Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
      VC++Files/myisam/myisam.dsp:
        automatic changes
      VC++Files/myisam_ftdump/myisam_ftdump.dsp:
        automatic changes
      VC++Files/myisamchk/myisamchk.dsp:
        Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
      VC++Files/myisamlog/myisamlog.dsp:
        Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
      VC++Files/myisammrg/myisammrg.dsp:
        Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
      VC++Files/myisampack/myisampack.dsp:
        Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
      VC++Files/mysql.dsw:
        Automatic changes
      VC++Files/mysqlbinlog/mysqlbinlog.dsp:
        Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
      VC++Files/mysqlcheck/mysqlcheck.dsp:
        Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
      VC++Files/mysqldemb/mysqldemb.dsp:
        Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
      VC++Files/mysqlserver/mysqlserver.dsp:
        Automatic changes
      VC++Files/mysqlshutdown/mysqlshutdown.dsp:
        Automatic changes
      VC++Files/mysqlwatch/mysqlwatch.dsp:
        Automatic changes
      VC++Files/mysys/mysys.dsp:
        Automatic changes
      VC++Files/pack_isam/pack_isam.dsp:
        Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
      VC++Files/perror/perror.dsp:
        Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
      VC++Files/regex/regex.dsp:
        Automatic changes
      VC++Files/replace/replace.dsp:
        Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
      VC++Files/sql/mysqld.dsp:
        Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
      VC++Files/strings/strings.dsp:
        Removed duplicate code for strnlen
      VC++Files/test1/test1.dsp:
        Automatic changes
      VC++Files/thr_test/thr_test.dsp:
        Automatic changes
      VC++Files/vio/vio.dsp:
        Automatic changes
      VC++Files/zlib/contrib/asm386/zlibvc.dsp:
        Automatic changes
      VC++Files/zlib/zlib.dsp:
        Automatic changes
      extra/my_print_defaults.c:
        Fixed bug in --verbose
      include/m_string.h:
        Portability fix
      include/mysql_embed.h:
        Better setting of server_version variable
      include/mysql_version.h.in:
        Better license text handling
      innobase/pars/pars0lex.l:
        Remove compiler warnings
      innobase/trx/trx0sys.c:
        Remove compiler warnings
      libmysqld/lib_sql.cc:
        Better setting of server_version variable
      libmysqld/libmysqld.def:
        Add functions needed for mysql command line client
      myisam/myisam_ftdump.c:
        Remove compiler warnings
      mysys/sha1.c:
        Remove compiler warnings
      scripts/make_win_src_distribution.sh:
        Safety fix
      scripts/mysql_install_db.sh:
        Backport from 4.1 to allow make_win_src_distribution create the privilege tables
      sql/Makefile.am:
        Add new file mysqld_suffix.h
        Remove not used file sql_olap.h
      sql/ha_innodb.cc:
        Remove not used variable
      sql/mysqld.cc:
        Better setting of server_version variable
      sql/set_var.cc:
        Fixed bug when showing lower_case_file_system
      strings/ctype-tis620.c:
        Remove compiler warnings
      2d67f1e0
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · 4eb67ce4
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.0
      
      
      sql/set_var.cc:
        Auto merged
      4eb67ce4
    • unknown's avatar
      Fix for BUG#3829 "Setting server_id on fly doesn't allow replication to start" · 66c96f2c
      unknown authored
      (fix by our Harrison Fisk): when one does SET GLOBAL SERVER_ID=x, we must set
      server_id_supplied to 1.
      
      
      sql/mysql_priv.h:
        server_id_supplied must be here to be visible in set_var.cc
      sql/mysqld.cc:
        rephrasing warnings when server id is not set explicitely.
      sql/set_var.cc:
        when one does SET GLOBAL SERVER_ID=x; it should be considered as explicitely setting
        the server id, so do server_id_supplied=1.
      sql/slave.cc:
        Correcting wrong comment
      66c96f2c
    • unknown's avatar
      Fixed BUG#3709: SELECT INTO 1 FROM DUAL not parsed as expected · de2c3523
      unknown authored
      Made the combination of INTO and FROM DUAL work, e.g.
      SELECT 1 INTO @x FROM DUAL.
      As a consequence, DUAL is made a reserved word. It would work to not have
      it reserved, but it was deemed to be confusing as a user defined table by
      the same name then must be qualified with a db (schema).
      
      
      sql/sql_yacc.yy:
        Made the combination of INTO and FROM DUAL work, e.g.
        SELECT 1 INTO @x FROM DUAL.
        As a consequence, DUAL is made a reserved word. It would work to not have
        it reserved, but it was deemed to be confusing as a user defined table by
        the same name then must be qualified with a db (schema).
      de2c3523
    • unknown's avatar
      Fix for Bug#3754 "SET GLOBAL myisam_max_sort_file_size doesn't · 458f0751
      unknown authored
      work as expected": precision-losing conversion removed from 
      sys_var_thd_ulonglong.
      
      
      mysql-test/r/variables.result:
        Test case for Bug#3754
      mysql-test/t/variables.test:
        Test case for Bug#3754
      sql/set_var.cc:
        Fix for Bug#3754: precision-losing conversion removed from 
        sys_var_thd_ulonglong.
      458f0751
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · c907e6fd
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.ps
      
      
      sql/sql_parse.cc:
        Auto merged
      tests/client_test.c:
        Auto merged
      c907e6fd
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 64c5d311
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      client/mysql.cc:
        Auto merged
      64c5d311
    • unknown's avatar
      Portability fixes · a41883fa
      unknown authored
      Fixed wrong number of warnings/duplicates for machines with high-byte-first
      
      
      client/mysql.cc:
        Remove not used variables
      client/mysqltest.c:
        Remove double ;
      myisam/ft_nlq_search.c:
        Fix valgrind error (not fatal)
      myisam/rt_test.c:
        Portability fix
      mysql-test/r/rpl_trunc_binlog.result:
        Portability fix
      mysql-test/t/rpl_trunc_binlog.test:
        Portability fix
        (Column 23 was different on openbsd)
      sql/sql_insert.cc:
        Fixed wrong number of warnings/duplicates for machines with high-byte-first
      strings/ctype-big5.c:
        Portability fix
      strings/ctype-gbk.c:
        Portability fix
      strings/ctype-mb.c:
        Portability fix
      strings/ctype-uca.c:
        Portability fix
      tests/client_test.c:
        Portability fixes
      a41883fa
  7. 18 May, 2004 3 commits
    • unknown's avatar
      Fix for BUG33649: Post-review fixes · ea44ccb0
      unknown authored
      
      sql/sql_class.h:
        Fix for BUG33649: Post-review fixes: added RNEXT_SAME
      sql/sql_handler.cc:
        Fix for BUG33649: Post-review fixes: added RNEXT_SAME
      ea44ccb0
    • unknown's avatar
      Fix and test case for BUG#3649. · cdf7471c
      unknown authored
      
      mysql-test/r/handler.result:
        Test case for BUG#3649
      mysql-test/t/handler.test:
        Test case for BUG#3649
      sql/sql_handler.cc:
        Fix for BUG#3649: when doing an index scan for an equality condition, use index_next_same to retrieve subsequent rows.
      cdf7471c
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 · f4ef8291
      unknown authored
      into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
      
      
      f4ef8291