1. 24 May, 2004 13 commits
    • unknown's avatar
      Merge · c54f3ba6
      unknown authored
      
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/sql_lex.h:
        SCCS merged
      c54f3ba6
    • unknown's avatar
      Added replication tests · fbfdcf22
      unknown authored
      fbfdcf22
    • unknown's avatar
      Added support for PREPARE stmt1 FROM @var, · c0729cbb
      unknown authored
      Fixed the problem of previous patch with replication,
      More post-review fixes
      
      
      sql/sql_parse.cc:
        Added support for PREPARE stmt1 FROM @var
      sql/sql_prepare.cc:
        Added support for PREPARE stmt1 FROM @var, 
        Fixed the problem of previous patch with replication
        Post-review fixes.
      c0729cbb
    • unknown's avatar
      Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 88da3ae5
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/TASK_ALTER_INFO/mysql-4.1
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      88da3ae5
    • unknown's avatar
      Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · 8233cdd7
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/TASK_ALTER_INFO/mysql-4.1
      
      
      sql/sql_table.cc:
        Auto merged
      8233cdd7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · ca25eb05
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      ca25eb05
    • 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
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · cc3d7f7a
      unknown authored
      into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-macosx
      
      
      cc3d7f7a
    • unknown's avatar
      Fix for bug which caused temp_table.test fail on Darwin 7.3 · 0bf85cfd
      unknown authored
      The code in mysql_create_table() code assumes that if lower_case_names==2 then table alias 
      should contain unchanged table name, and this was not true for temporary tables which
      had 'tmp-table' constant as alias. Now we are using table name as alias for such tables.
      
      
      sql/sql_lex.cc:
        Removed tmp_table_alias constant which is no longer used.
      sql/sql_lex.h:
        Removed tmp_table_alias constant which is no longer used.
      sql/sql_yacc.yy:
        Let us use table name instead of 'tmp-table' as alias for table being created by 
        CREATE TEMPORARY TABLE statement. This fixes failing temp_table.test on Darwin 7.3 
        since mysql_create_table() code assumes that if lower_case_names==2 then table alias 
        should contain unchanged table name (and now this assumtion is true but it were false
        for temporary tables before...).
      0bf85cfd
    • 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 10 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 11ee33b1
      unknown authored
      into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bcut
      
      
      11ee33b1
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8a3adca7
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.3744
      
      
      client/mysql.cc:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      8a3adca7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · fe0829f6
      unknown authored
      into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bcut
      
      
      fe0829f6
    • unknown's avatar
      Introduced parameter object "ALTER_INFO" for mysql_alter_table · ea63df7f
      unknown authored
      to make list of parameters in mysql_alter_table shorted
      to avoid warning in MSVC (windows) building 
      
      
      sql/mysql_priv.h:
        Introduced parameter object "ALTER_INFO" for mysql_alter_table
        - changed declaration of mysql_alter_table
        - changed declaration of mysql_drop_index 
          (replaced List<Alter_drop> by ALTER_INFO)
      sql/sql_lex.h:
        Introduced parameter object "ALTER_INFO" for mysql_alter_table
        - declared struct ALTER_INFO
        - added ALTER_INFO alter_info; into LEX
        - removed fields which were added into ALTER_INFO from LEX
      sql/sql_parse.cc:
        Introduced parameter object "ALTER_INFO" for mysql_alter_table
        - changed invotaions of mysql_alter_table
        - replaced cleaning fields in SQLCOM_OPTIMIZE by ALTER_INFO::reset
        - changed invocation of mysql_drop_index (replaced lex->drop_list by &lex->alter_info)
        - changed definition of mysql_create_index and mysql_drop_index to use ALTER_INFO
      sql/sql_table.cc:
        Introduced parameter object "ALTER_INFO" for mysql_alter_table
        - changed definition of mysql_alter_table
      sql/sql_yacc.yy:
        Introduced parameter object "ALTER_INFO" for mysql_alter_table
        - replaced using of removed from LEX fields my fields of LEX::alter_info
      ea63df7f
    • unknown's avatar
      Addition to the fix for bug #3791 (libmysqld mysql segfaults if can's find · d301fa91
      unknown authored
      errormsg.sys)
      Cleanups added
      
      
      client/mysql.cc:
        my_end(0) added to do all the necessary cleanups
        glob_buffer.realloc() moved beneath the mysql_server_init
      d301fa91
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · c38885fd
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      c38885fd
    • unknown's avatar
      fix for macosx where SIGRTMIN is missing · d4c67b60
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      d4c67b60
    • unknown's avatar
      b0528f1a
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · fc68be78
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
      
      
      sql/item.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      fc68be78
    • unknown's avatar
      WL#1622 "SQL Syntax for Prepared Statements": Post-review fixes (1 of 2) · e7710af7
      unknown authored
      
      mysql-test/r/ps.result:
        Added tests for PREPARE stmt1 FROM @var syntax
      mysql-test/t/ps.test:
        Added tests for PREPARE stmt1 FROM @var syntax
      mysys/my_error.c:
        Added support for "%.*s" format
      sql/item.cc:
        Removed one redundant Item_param::set_value function
      sql/item.h:
        Removed one redundant Item_param::set_value function
      sql/mysqld.cc:
        Reformmated the code
      sql/share/czech/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/share/dutch/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/share/english/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/share/estonian/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/share/french/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/share/german/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/share/greek/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/share/hungarian/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/share/italian/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/share/japanese/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/share/korean/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/share/norwegian-ny/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/share/norwegian/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/share/polish/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/share/portuguese/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/share/romanian/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/share/russian/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/share/slovak/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/share/spanish/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/share/swedish/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/share/ukrainian/errmsg.txt:
        Changed ER_UNKNOWN_STMT_HANDLER format string
      sql/sql_class.h:
        SQL Prepared statements now can't be used by binary protocol commands
      sql/sql_lex.h:
        Added support for PREPARE stmt1 FROM @var syntax.
      sql/sql_parse.cc:
        Added support for PREPARE stmt1 FROM @var syntax.
      sql/sql_prepare.cc:
        Code cleanup
      sql/sql_yacc.yy:
        Added support for PREPARE stmt1 FROM @var syntax.
      e7710af7
  5. 20 May, 2004 5 commits
  6. 19 May, 2004 8 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