1. 06 Oct, 2002 1 commit
    • unknown's avatar
      One more commit to do the merge of new 4.1 tree · 8640cd35
      unknown authored
      
      client/mysqladmin.c:
        Handle new password.c prototypes
      include/mysql_com.h:
        New prototypes
      libmysql/Makefile.shared:
        Client need sha1 compiled in now
      libmysql/password.c:
        Replace copy with symlink
      mysql-test/r/func_crypt.result:
        Fix test results to handle new password function
      mysql-test/t/func_crypt.test:
        New tests for new password function
      sql/item_create.cc:
        add old_password() function
      sql/item_create.h:
        add old_password() function
      sql/item_strfunc.cc:
        add old_password() function
        changes to new password.c functions prototypes
      sql/item_strfunc.h:
        add old_password function
        handle new prototypes
      sql/lex.h:
        add OLD_PASSWORD function
      sql/password.c:
        Continue to work on new password handling
      sql/sql_acl.cc:
        Handle new passwords
      sql/sql_yacc.yy:
        Changes for new prototypes
      8640cd35
  2. 03 Oct, 2002 11 commits
  3. 02 Oct, 2002 9 commits
    • unknown's avatar
      Merging... · aa9e2fa7
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      include/mysql_com.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/mysqld.cc:
        Trying to merge :(
      aa9e2fa7
    • unknown's avatar
      Changeset to deal with 4.1 -> 4.0 merge · 1f443c95
      unknown authored
      
      include/mysql_com.h:
        Partial changes for new secure connection handing required to 
        pull 4.0 -> 4.1 merge
      sql/item_strfunc.cc:
        Handling of dynamic possible length for password
      sql/item_strfunc.h:
        Larger buffer for password
      sql/mysqld.cc:
        Added option to force old password format
      sql/password.c:
        Begin implementing new hashing
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      1f443c95
    • unknown's avatar
      Merge with 4.0.4 · 95e772b6
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      client/mysqldump.c:
        Auto merged
      include/Makefile.am:
        Auto merged
      include/my_base.h:
        Auto merged
      include/my_sys.h:
        Auto merged
      include/sslopt-case.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      libmysql/libmysql.def:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      myisam/ft_boolean_search.c:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      myisam/mi_create.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/type_set.result:
        Auto merged
      mysql-test/t/create.test:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/net_pkg.cc:
        Auto merged
      sql/net_serv.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/share/english/errmsg.txt:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_udf.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/unireg.h:
        Auto merged
      sql/sql_cache.cc:
        Code cleanup (removed ifdef)
      95e772b6
    • unknown's avatar
      Update libmysqld to use 4.1 protocol. · 896bc7d0
      unknown authored
      
      BitKeeper/etc/ignore:
        added sql_error.cc sql_prepare.cc
      BitKeeper/deleted/.del-sql_error.cc~2f1caca8d2485dbe:
        deleted
      BitKeeper/deleted/.del-sql_prepare.cc~f703729793935ed6:
        deleted
      libmysqld/libmysqld.c:
        Update to use 4.1 protocol.
        Added mysql_warning_count() and mysql_warnings()
      myisam/rt_test.c:
        Added missing variable
      896bc7d0
    • unknown's avatar
      merge · ff8f0077
      unknown authored
      
      configure.in:
        Auto merged
      ff8f0077
    • unknown's avatar
      - small modification to scripts/make_binary_distribution.sh (add the · d3664b02
      unknown authored
         up-to-date BK changelog instead of sql/ChangeLog, add LICENSE if
         available)
      
      
      scripts/make_binary_distribution.sh:
         - Don't include sql/ChangeLog in the binary distribution (it's not
           updated anymore since we've moved to BK)
         - Include the BK ChangeLog from top level directory instead, if it exists
         - also add the LICENSE file to the binary distribution, if it exists
           (required for the non-GPL builds)
      d3664b02
    • unknown's avatar
      merge with work · aecdd699
      unknown authored
      
      mysql-test/r/fulltext.result:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/merge.result:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/share/czech/errmsg.txt:
        Auto merged
      sql/share/danish/errmsg.txt:
        Auto merged
      sql/share/dutch/errmsg.txt:
        Auto merged
      sql/share/estonian/errmsg.txt:
        Auto merged
      sql/share/french/errmsg.txt:
        Auto merged
      sql/share/greek/errmsg.txt:
        Auto merged
      sql/share/hungarian/errmsg.txt:
        Auto merged
      sql/share/italian/errmsg.txt:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/share/japanese/errmsg.txt:
        Auto merged
      sql/share/korean/errmsg.txt:
        Auto merged
      sql/share/norwegian-ny/errmsg.txt:
        Auto merged
      sql/share/norwegian/errmsg.txt:
        Auto merged
      sql/share/polish/errmsg.txt:
        Auto merged
      sql/share/portuguese/errmsg.txt:
        Auto merged
      sql/share/romanian/errmsg.txt:
        Auto merged
      sql/share/slovak/errmsg.txt:
        Auto merged
      sql/share/spanish/errmsg.txt:
        Auto merged
      sql/share/swedish/errmsg.txt:
        Auto merged
      myisam/rt_test.c:
        Merge
      myisam/sp_key.c:
        Merge
      myisam/sp_test.c:
        Merge
      mysql-test/r/create.result:
        Merge
      sql/share/english/errmsg.txt:
        Merge
      sql/sql_yacc.yy:
        Merge
      aecdd699
    • unknown's avatar
      Fixes and code cleanups after merge with 4.0.3 · 5a28c2ca
      unknown authored
      Warning handling and initial prepared statement handling (last not complete yet)
      Changed a lot of functions that returned 0/1 to my_bool type.
      GRANT handling now uses read/write locks instead of mutex
      Change basic net functions to use THD instead of NET
      (needed for 4.1 protocol)
      Use my_sprintf instead of sprintf() + strlen()
      Added alloc_query() to be able to chare query initialization code with
      prepared statements.
      Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()
      
      Note that the following test fails (will be fixed ASAP):
      sub_select, union, rpl_rotate_logs and rpl_mystery22
      
      
      BitKeeper/deleted/.del-README~3449730baf983117:
        Delete: mysql-test/t/README
      BitKeeper/deleted/.del-sql_error.cc~2f1caca8d2485dbe:
        Delete: libmysqld/sql_error.cc
      BitKeeper/deleted/.del-sql_prepare.cc~f703729793935ed6:
        Delete: libmysqld/sql_prepare.cc
      Docs/manual.texi:
        Updated variable list
      client/mysql.cc:
        Show warning count to user.
      client/mysqltest.c:
        Add warnings to test results
      configure.in:
        New shared library version number
      include/errmsg.h:
        Indentation cleanup
      include/mysql.h:
        Removed MYSQL_ERROR
        Indentaion cleanups
      include/mysql_com.h:
        Changed functions to returns true/false to my_bool.
      include/mysqld_error.h:
        New error messages
      isam/pack_isam.c:
        Indentation change
      libmysql/Makefile.am:
        Fix of wrong merge
      libmysql/Makefile.shared:
        Indentation cleanup
      libmysql/errmsg.c:
        Removed not used errors
      libmysql/libmysql.c:
        Change functions to return 1 on error (not -1)
        Change type of functions that returns 0/1 to my_bool
        Lot of code optimizations.
        Lot of changes for prepared statements. This now handles sending of binary data to server.
        Receving of binary data is not yet done (will have to wait until server code for this is ready)
        mysql_warning_count and mysql_warnings() implemented.
      libmysql/libmysql.def:
        Added mysql_warnings and mysql_warning_count
      libmysql/manager.c:
        Fixed wrong testing of result from my_connect()
      libmysqld/lib_sql.cc:
        Removed global variable THR_NET
        Change basic net functions to use THD instead of NET
        GRANT handling now uses read/write locks instead of mutex
      libmysqld/libmysqld.c:
        Changed functions to be my_bool
      myisam/ft_boolean_search.c:
        Trivial code cleanup
      myisam/ft_stopwords.c:
        Trivial code cleanup
      myisam/mi_check.c:
        Update to 4.1 structures
      myisam/myisampack.c:
        Trivial code cleanup
      myisam/rt_key.c:
        Code cleanup
      myisam/rt_test.c:
        Code cleanup
        Removed compiler warnings
      myisam/sp_key.c:
        Indentation changes
      myisam/sp_test.c:
        Removed compiler warnings
      mysql-test/README:
        Updated to reflect the new --external flag.
      mysql-test/mysql-test-run.sh:
        --local (start new server) is now default.
        Use --external to test against external server.
      mysql-test/r/rollback.result:
        Updated for 4.1 warnings
      mysql-test/r/rpl_log.result:
        Update for 4.1
      mysql-test/t/rollback.test:
        Updated for 4.1 warnings
      mysql-test/t/rpl_log_pos.test:
        Portability fix
      mysys/hash.c:
        Indentation change
      mysys/my_error.c:
        Indentation change
      mysys/tree.c:
        Updated file description
      sql/field.cc:
        Fixed bugs introduced by merge
        Use my_sprintf instead of sprintf() + strlen()
      sql/field.h:
        Add CHARSET_INFO to field structure
      sql/gstream.h:
        Indentation changes.
        Added GPL copyright header
      sql/ha_innodb.cc:
        Updated parameters for net functions.
      sql/item.cc:
        Updates of Item_param
        Indentation changes
      sql/item.h:
        Removed size_of() function from item.
      sql/item_func.cc:
        Update function usage for 4.1
        Added get_system_var()
      sql/item_func.h:
        Indentation change
      sql/item_strfunc.cc:
        Removed not needed inclusion of gstream.h
        Update to use system variables (from 4.0)
      sql/item_sum.h:
        Removed size_of() functions from item.
      sql/item_timefunc.cc:
        Change sprintf() + strlen() -> my_sprintf()
        Added length parameter to ->append()
      sql/item_timefunc.h:
        Removed size_of() functions from item.
      sql/item_uniq.h:
        Removed size_of() functions from item.
      sql/lex.h:
        Removed SQL_ERROR_COUNT variable
      sql/log.cc:
        Change sprintf() + strlen() -> my_sprintf()
      sql/log_event.cc:
        Change sprintf() + strlen() -> my_sprintf()
      sql/mini_client.cc:
        Added check that one always specifies a length to mc_mysql_query()
      sql/mysql_priv.h:
        New prototypes
        Change of NET -> THD parameter for net functions.
      sql/mysqld.cc:
        New startup options:  'max_prepared_statements', 'max_error_count'
        Updated usage of net functions.
      sql/net_pkg.cc:
        Change basic net functions to use THD instead of NET
        (needed to be able to handle 4.0 and 4.1 protocols)
        Lots of function comments
      sql/net_serv.cc:
        Change int return values -> my_bool
        Updated net_write_command() to take an extra header block to be added to the packet.
        (This made the prepared statement code much nicer and more efficient)
      sql/repl_failsafe.cc:
        Update net functions to use THD instead of NET
      sql/set_var.cc:
        Added @@error_count and @@warning_count variables.
        Updated to 4.1 function usage
      sql/set_var.h:
        Added @@error_count and @@warning_count variables.
      sql/share/czech/errmsg.txt:
        Removed Warning: from warning error messages.
      sql/share/english/errmsg.txt:
        Removed Warning: from warning error messages.
      sql/share/greek/errmsg.txt:
        Removed Warning: from warning error messages.
      sql/share/hungarian/errmsg.txt:
        Removed Warning: from warning error messages.
      sql/share/japanese/errmsg.txt:
        Removed Warning: from warning error messages.
      sql/share/korean/errmsg.txt:
        Removed Warning: from warning error messages.
      sql/share/norwegian-ny/errmsg.txt:
        Removed Warning: from warning error messages.
      sql/share/norwegian/errmsg.txt:
        Removed Warning: from warning error messages.
      sql/share/polish/errmsg.txt:
        Removed Warning: from warning error messages.
      sql/share/romanian/errmsg.txt:
        Removed Warning: from warning error messages.
      sql/share/slovak/errmsg.txt:
        Removed Warning: from warning error messages.
      sql/share/swedish/errmsg.txt:
        Removed Warning: from warning error messages.
      sql/slave.cc:
        Change basic net functions to use THD instead of NET
        skip_load_data_file recoded to fit new client/server protocol
      sql/spatial.h:
        Added copyright header
        Indentation cleanups
      sql/sql_acl.cc:
        Change basic net functions to use THD instead of NET
        GRANT handling now uses read/write locks instead of mutex
      sql/sql_analyse.cc:
        Change basic net functions to use THD instead of NET
        sprintf() + strlen() -> my_sprintf()
      sql/sql_base.cc:
        More DBUG statements
      sql/sql_class.cc:
        Change basic net functions to use THD instead of NET
        warning and prepared statement handling
      sql/sql_class.h:
        Change basic net functions to use THD instead of NET
        warning and prepared statement handling
      sql/sql_db.cc:
        Code cleanup & optimization.
      sql/sql_delete.cc:
        Change basic net functions to use THD instead of NET
      sql/sql_derived.cc:
        Change basic net functions to use THD instead of NET
      sql/sql_do.cc:
        Change basic net functions to use THD instead of NET
      sql/sql_error.cc:
        Big rewrite of error handling.
      sql/sql_handler.cc:
        Change basic net functions to use THD instead of NET
      sql/sql_insert.cc:
        Change basic net functions to use THD instead of NET
      sql/sql_lex.cc:
        Change basic net functions to use THD instead of NET
      sql/sql_lex.h:
        Added param_count to st_select_lex_node
      sql/sql_list.h:
        Removed not needed error list.
      sql/sql_load.cc:
        Change basic net functions to use THD instead of NET
      sql/sql_parse.cc:
        Change basic net functions to use THD instead of NET
        Added alloc_query() to be able to chare query initialization code with
        prepared statements.
        Update of warning handling.
        Added create_select_for_variable() (for SHOW COUNT(*) WARNINGS)
      sql/sql_prepare.cc:
        Initial prepared statement handling
      sql/sql_rename.cc:
        Change basic net functions to use THD instead of NET
      sql/sql_repl.cc:
        Change basic net functions to use THD instead of NET
      sql/sql_select.cc:
        Small code cleanups
        Added missing initialization of error that caused some queries that returned an empty result set to fail
      sql/sql_select.h:
        Ensure that JOIN.error is properly initialized
      sql/sql_show.cc:
        Change basic net functions to use THD instead of NET
        A lot of optimization
      sql/sql_table.cc:
        Change basic net functions to use THD instead of NET
        Indentaion cleanup
      sql/sql_udf.cc:
        Change basic net functions to use THD instead of NET
      sql/sql_union.cc:
        Change basic net functions to use THD instead of NET
      sql/sql_update.cc:
        Change basic net functions to use THD instead of NET
      sql/sql_yacc.yy:
        Change basic net functions to use THD instead of NET
        Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()
      sql/structs.h:
        Moved structures to files where they was used
      sql/table.cc:
        Don't accept empty database names
      sql/uniques.cc:
        Indentation cleanup
      sql/unireg.cc:
        Change basic net functions to use THD instead of NET
      sql/unireg.h:
        Added defaults for warnings and prepared statements
      strings/ctype-simple.c:
        optimization
      tests/client_test.c:
        Fixed wrong paramaters to printf()
      5a28c2ca
    • unknown's avatar
      Fix for building shared libraries with a patched glibc · 9ffa49c9
      unknown authored
      Don't require UPDATE_ACL for REPLACE
      
      
      Docs/manual.texi:
        Changelog
      configure.in:
        Fix for building shared libraries with a patched glibc
      sql/sql_parse.cc:
        Don't require UPDATE_ACL for REPLACE
      9ffa49c9
  4. 01 Oct, 2002 4 commits
    • unknown's avatar
      manual.texi Fix a few agreement problems. · 00b8917c
      unknown authored
      
      Docs/manual.texi:
        Fix a few agreement problems.
      00b8917c
    • unknown's avatar
      - Tagged ChangeSet 1.1321 as mysql-4.0.4 · c506c395
      unknown authored
       - added some missing changelog entries to the 4.0.5 changelog
       - applied small fix to configure.in from monty (already applied manually
         to configure.in of the 4.0.4 release source files - not relevant for
         normal builds anyway)
      
      
      Docs/manual.texi:
         - added missing changelog entries
         - added the 4.0.4 release date
      configure.in:
         - bumped up version number to 4.0.5-beta, now that the 4.0.4 builds
           are done
         - applied fix from Monty to be able to build shared libraries even
           when the the static NSS libraries are installed. This patch has already
           been applied to the released 4.0.4 sources to work around a local build
           problem, but has not been checked in yet.
      c506c395
    • unknown's avatar
      User variables didn't store charset, so this didn't work · 0d2b6552
      unknown authored
      as expected and returned default charset instead:
      SET @x = _koi8_ru'test';
      SELECT CHARSET(@x);
      
      
      0d2b6552
    • unknown's avatar
      9564cd43
  5. 30 Sep, 2002 4 commits
  6. 29 Sep, 2002 1 commit
  7. 27 Sep, 2002 10 commits