Commit graph

64 commits

Author SHA1 Message Date
unknown
49b0312dd7 merge commit, hope that none of bar and dlenev changes were
lost.


BitKeeper/etc/logging_ok:
  auto-union
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
include/mysqld_error.h:
  merge commit: new error message added
sql-common/client.c:
  merge commit
sql/mysql_priv.h:
  merge commit: autoremerge
sql/set_var.h:
  merge commit
sql/share/czech/errmsg.txt:
  merge commit
sql/share/danish/errmsg.txt:
  merge commit
sql/share/dutch/errmsg.txt:
  merge commit
sql/share/english/errmsg.txt:
  merge commit
sql/share/estonian/errmsg.txt:
  merge commit
sql/share/french/errmsg.txt:
  merge commit
sql/share/german/errmsg.txt:
  merge commit
sql/share/greek/errmsg.txt:
  merge commit
sql/share/hungarian/errmsg.txt:
  merge commit
sql/share/italian/errmsg.txt:
  merge commit
sql/share/japanese/errmsg.txt:
  merge commit
sql/share/korean/errmsg.txt:
  merge commit
sql/share/norwegian-ny/errmsg.txt:
  merge commit
sql/share/norwegian/errmsg.txt:
  merge commit
sql/share/polish/errmsg.txt:
  merge commit
sql/share/portuguese/errmsg.txt:
  merge commit
sql/share/romanian/errmsg.txt:
  merge commit
sql/share/russian/errmsg.txt:
  merge commit
sql/share/serbian/errmsg.txt:
  merge commit
sql/share/slovak/errmsg.txt:
  merge commit
sql/share/spanish/errmsg.txt:
  merge commit
sql/share/swedish/errmsg.txt:
  merge commit
sql/share/ukrainian/errmsg.txt:
  merge commit
sql/slave.cc:
  merge commit
sql/slave.h:
  merge commit
sql/sql_acl.cc:
  merge commit
sql/sql_parse.cc:
  merge commit
sql/sql_repl.h:
  merge commit
2003-09-03 14:12:10 +04:00
unknown
aa900a5ece After merge fixes + bugs from last merge
mysql-test/mysql-test-run.sh:
  Use --skip-bdb with valgrind (as bdb tables causes valgrind to hang)
  Fix --ddd option
mysql-test/t/union.test:
  After merge fix
sql/item.cc:
  Fixed typo
sql/log_event.cc:
  Move current_tablenr to open_tables()
sql/protocol.h:
  Fixed wrong memory reference
sql/set_var.cc:
  After merge fix
sql/slave.cc:
  Reset thd->lex.current_select before execute
sql/sql_base.cc:
  Move current_tablenr to open_tables()
sql/sql_class.cc:
  Move current_tablenr to open_tables()
  Add missing update_charset()
sql/sql_parse.cc:
  Move current_tablenr to open_tables()
  Simple cleanup
sql/table.cc:
  Code cleanup
2003-08-19 16:00:12 +03:00
unknown
30ced7f7f6 Style fixes, comments for 4.1.1 authorization
Now special 1-byte packet is used for request of old password
Fixed bug with --skip-grant-tables and acl_getroot


include/mysql.h:
  removed scramble_323 member as now scramble_323 function does not count
  on trailing zero for scramble
include/mysql_com.h:
  updated declarations
libmysql/libmysql.c:
  now server sends special 1-byte packet instead of old scramble
  to re-request password.
  mysql->scramble_323 replaced with mysql->scramble
sql-common/client.c:
  now server sends special 1-byte packet instead of old scramble
  to re-request password.
  mysql->scramble_323 replaces with mysql->scramble
sql/password.c:
  comments beautified
  hash_password now accepts password length
sql/protocol.cc:
  added send_old_password_request function
sql/protocol.h:
  added send_old_password_request function
sql/sql_acl.cc:
  style fixes, bug with --skip-grant-tables and acl_getroot
  fixed
sql/sql_class.h:
  thd->scramble_323 removed as now
  old functions accept not null-terminated scrambles
sql/sql_crypt.cc:
  fixed with new hash_password proto
sql/sql_parse.cc:
  style fixes
  few comments added
2003-07-18 18:25:54 +04:00
unknown
69e084af1e new version of help 2003-05-29 17:47:31 -04:00
unknown
5d3eec14dd New 4.1 protocol; SQLSTATE, CLIENT_MULTI_RESULTS, client character set
Docs/internals.texi:
  Updated protocol information
include/mysql.h:
  Added catalog to MYSQL_FIELD
  Added sqlstate handling to protocol
include/mysql_com.h:
  New 4.1 protocol
libmysql/libmysql.c:
  Added sqlstate handling
  Added CLIENT_MULTI_RESULTS
sql/field.cc:
  Indentation cleanup
sql/field.h:
  Indentation cleanup
sql/mysql_priv.h:
  Changed arguments to close_connection()
sql/mysqld.cc:
  Changed arguments to close_connection()
  Added checking of extra arguments to mysqld
sql/protocol.cc:
  Fixed bug in TIME handling
  Added SQLSTATE on errors
  Removed net_send_error()
sql/protocol.h:
  Removed net_send_error()
sql/repl_failsafe.cc:
  Fixed arguments to close_connection()
sql/sql_parse.cc:
  New 4.1 protocol
2003-05-26 19:01:20 +03:00
unknown
f0909cd71a SCRUM
Protocol_cursor class and sql-common/ directory


Makefile.am:
  pack.c added to linked sources
include/mysql.h:
  net_field_length_ll declaration added
include/mysql_com.h:
  net_field_length declaration added
libmysql/Makefile.am:
  sql-common files symlinked
libmysql/Makefile.shared:
  pack.lo target added
libmysql/libmysql.c:
  net_field_length removed from here
sql/Makefile.am:
  pack.c added to the sources
sql/mini_client.cc:
  mc_net_field_length functions replaced with net_field_length
sql/protocol.h:
  Protocol_cursor class added
2003-04-23 19:37:33 +05:00
unknown
65ae25d092 New methods to store strings with "convert to" argimument 2003-04-07 13:52:48 +05:00
unknown
c51c782c55 New variable to turn off automatic charset conversion of query results
Some speed improvements
2003-03-21 15:18:52 +04:00
unknown
3f6a00d1ac CONVERT class was removed 2003-03-18 17:01:32 +04:00
unknown
3a407e5892 Preparing to client<->server autoconvert 2003-03-17 13:14:04 +04:00
unknown
f9dff9748e SCRUM
embedded-related changes


include/mysql_com.h:
  net_flush emptification
libmysqld/lib_sql.cc:
  Some Protocol:: methods implemented
sql/convert.cc:
  changes to use convert in embedded library
sql/field.cc:
  set_key_image changed
sql/item.cc:
  obsolete functions removed
sql/item.h:
  embedded-related changes in Protocol class
sql/log.cc:
  there's no ports in embedded library
sql/mysqld.cc:
  some debug stuff
sql/protocol.cc:
  embedded-related changes
sql/protocol.h:
  embedded-related changes
sql/sql_cache.cc:
  comment added
sql/sql_class.cc:
  no need to do special embedded select_send::send_row
sql/sql_class.h:
  embedded-related changes
sql/sql_parse.cc:
  comments added debugging stuff deleted
sql/sql_show.cc:
  non-protocol sending removed
2003-01-20 18:47:25 +04:00
unknown
09b79b65f2 SCRUM
embedded library trimming


include/my_global.h:
  HAVE_REPLICATION & HAVE_EXTERNAL_CLIENT macro definitions
libmysqld/lib_sql.cc:
  Protocol:: methods implementation for embedded case
sql/field.cc:
  geometry type methods implementations
sql/ha_berkeley.cc:
  set_nfields deletion
sql/ha_innodb.cc:
  macro changed
sql/ha_myisam.cc:
  set_nfields deletion
sql/ha_myisam.h:
  code #ifdef-ed
sql/item.cc:
  bugfix
sql/item_func.cc:
  macro changed
sql/item_strfunc.cc:
  superfluous code deleted
sql/log.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/log_event.cc:
  #ifdef constructions changed
sql/log_event.h:
  #ifdef-s changed
sql/mf_iocache.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/mini_client.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/mysql_priv.h:
  code removation
sql/mysqld.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/opt_range.cc:
  code trimming
sql/protocol.cc:
  net_store_data becomes a member of Protocol
sql/protocol.h:
  changes to make Protocol working in embedded library
sql/repl_failsafe.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/repl_failsafe.h:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/set_var.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/slave.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/slave.h:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/sql_parse.cc:
  code trimming
sql/sql_prepare.cc:
  comment added
sql/sql_repl.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/sql_repl.h:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/sql_show.cc:
  mysql_list_processes to work in embedded library
sql/sql_table.cc:
  set_nfields deletion
2003-01-15 12:11:44 +04:00
unknown
44d684d13f Merging&testing
libmysqld/lib_sql.cc:
  Protocol::send_fields added
sql/ha_berkeley.cc:
  set_nfields calls added
sql/ha_myisam.cc:
  set_nfield call added
sql/mysql_priv.h:
  embedded_send_row header changed
sql/protocol.cc:
  Protocol::write edited for embedded case
sql/protocol.h:
  n_fields member added
sql/sql_table.cc:
  sen_nfields added
2002-12-17 19:33:25 +04:00
unknown
f918dfc8b2 rename of net_pkg.cc to protocol.cc
Class for sending data from server to client (Protocol)
This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements.


libmysql/libmysql.c:
  Jump over reserved bits in the binary protocol
libmysqld/Makefile.am:
  rename of net_pkg.cc to protocol.cc
mysql-test/r/case.result:
  Fixed previously wrong test
mysql-test/r/cast.result:
  Fixed previously wrong test
sql/Makefile.am:
  Rename of net_pkg.cc to protocol.cc
sql/field.cc:
  Binary protocol
  Added key handling functions for new VARCHAR type
sql/field.h:
  New protocol
sql/ha_berkeley.cc:
  New protocol
sql/ha_berkeley.h:
  New protocol
sql/ha_innodb.cc:
  New protocol
sql/ha_myisam.cc:
  New protocol
sql/item.cc:
  New protocol
sql/item.h:
  New protocol
sql/item_func.cc:
  Removed old code from 3.23
sql/item_func.h:
  Set cached_result_type as it was previosly used before set
sql/item_subselect.cc:
  Standard make_field() is now good enough
sql/item_subselect.h:
  Use default make_field()
sql/item_sum.cc:
  Clean up Item_sum::make_field()
sql/item_sum.h:
  Use standard make_field()
sql/item_timefunc.h:
  return correct types for casts()
  Use standard make_field()
sql/log_event.cc:
  New protocol
sql/log_event.h:
  New protocol
sql/mysql_priv.h:
  Move things to protocol.h
sql/opt_range.cc:
  Indentation cleanups + small optimization
sql/procedure.h:
  Use MYSQL_TYPE instead of FIELD_TYPE
sql/protocol.cc:
  Class for sending data from server to client.
  This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements.
sql/repl_failsafe.cc:
  New protocol
sql/slave.cc:
  New protocol
sql/sql_acl.cc:
  New protocol
sql/sql_base.cc:
  Move send_fields() to protocol.cc
sql/sql_class.cc:
  New protocol
sql/sql_class.h:
  New protocol
sql/sql_db.cc:
  New protocol
sql/sql_error.cc:
  New protocol
sql/sql_handler.cc:
  New protocol
sql/sql_help.cc:
  New protocol
sql/sql_parse.cc:
  Remove wrong assert (variable was not initalized at this point)
sql/sql_prepare.cc:
  New protocol
sql/sql_repl.cc:
  New protocol
sql/sql_select.cc:
  New protocol
sql/sql_show.cc:
  New protocol
sql/sql_string.h:
  New functions used by the protocol functions
sql/sql_table.cc:
  New protocol
sql/structs.h:
  Make second_part ulong to prepare for ANSI sub-seconds
sql/time.cc:
  New convert function needed by the new protocol functions
2002-12-11 09:17:51 +02:00