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

1 files changed, 131 insertions, 0 deletions

diff --git a/sql/protocol.h b/sql/protocol.h
new file mode 100644
index 00000000000..b3ab0a2b31d
--- /dev/null
+++ b/sql/protocol.h
@@ -0,0 +1,131 @@
+/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+#ifdef __GNUC__
+#pragma interface			/* gcc class implementation */
+#endif
+
+#define PACKET_BUFFET_EXTRA_ALLOC	1024
+
+class CONVERT;
+class i_string;
+class THD;
+
+class Protocol
+{
+protected:
+  THD	 *thd;
+  String *packet;
+  uint field_pos;
+#ifndef DEBUG_OFF
+  enum enum_field_types *field_types;
+#endif
+
+public:
+  CONVERT *convert;
+
+  Protocol() {}
+  Protocol(THD *thd) { init(thd); }
+  void init(THD* thd);
+  bool send_fields(List<Item> *list, uint flag);
+  bool store(I_List<i_string> *str_list);
+  bool store(const char *from);
+  String *storage_packet() { return packet; }
+  inline void free() { packet->free(); }
+  bool write();
+  inline  bool store(uint32 from)
+  { return store_long((longlong) from); }
+  inline  bool store(longlong from)
+  { return store_longlong((longlong) from, 0); }
+  inline  bool store(ulonglong from)
+  { return store_longlong((longlong) from, 1); }
+  
+  virtual bool prepare_for_send(List<Item> *item_list) { return 0;}
+  virtual void prepare_for_resend()=0;
+
+  virtual bool store_null()=0;
+  virtual bool store_tiny(longlong from)=0;
+  virtual bool store_short(longlong from)=0;
+  virtual bool store_long(longlong from)=0;
+  virtual bool store_longlong(longlong from, bool unsigned_flag)=0;
+  virtual bool store(const char *from, uint length)=0;
+  virtual bool store(float from, uint32 decimals, String *buffer)=0;
+  virtual bool store(double from, uint32 decimals, String *buffer)=0;
+  virtual bool store(TIME *time)=0;
+  virtual bool store_date(TIME *time)=0;
+  virtual bool store_time(TIME *time)=0;
+  virtual bool store(Field *field)=0;
+};
+
+
+/* Class used for the old (MySQL 4.0 protocol) */
+
+class Protocol_simple :public Protocol
+{
+public:
+  Protocol_simple() {}
+  Protocol_simple(THD *thd) :Protocol(thd) {}
+  virtual void prepare_for_resend();
+  virtual bool store_null();
+  virtual bool store_tiny(longlong from);
+  virtual bool store_short(longlong from);
+  virtual bool store_long(longlong from);
+  virtual bool store_longlong(longlong from, bool unsigned_flag);
+  virtual bool store(const char *from, uint length);
+  virtual bool store(TIME *time);
+  virtual bool store_date(TIME *time);
+  virtual bool store_time(TIME *time);
+  virtual bool store(float nr, uint32 decimals, String *buffer);
+  virtual bool store(double from, uint32 decimals, String *buffer);
+  virtual bool store(Field *field);
+};
+
+
+class Protocol_prep :public Protocol
+{
+private:
+  uint field_count, bit_fields;
+public:
+  Protocol_prep() {}
+  Protocol_prep(THD *thd) :Protocol(thd) {}
+  virtual bool prepare_for_send(List<Item> *item_list);
+  virtual void prepare_for_resend();
+  virtual bool store_null();
+  virtual bool store_tiny(longlong from);
+  virtual bool store_short(longlong from);
+  virtual bool store_long(longlong from);
+  virtual bool store_longlong(longlong from, bool unsigned_flag);
+  virtual bool store(const char *from,uint length);
+  virtual bool store(TIME *time);
+  virtual bool store_date(TIME *time);
+  virtual bool store_time(TIME *time);
+  virtual bool store(float nr, uint32 decimals, String *buffer);
+  virtual bool store(double from, uint32 decimals, String *buffer);
+  virtual bool store(Field *field);
+};
+
+
+void send_warning(THD *thd, uint sql_errno, const char *err=0);
+void net_printf(THD *thd,uint sql_errno, ...);
+void send_ok(THD *thd, ha_rows affected_rows=0L, ulonglong id=0L,
+	     const char *info=0);
+void send_eof(THD *thd, bool no_flush=0);
+void net_send_error(NET *net, uint sql_errno, const char *err);
+char *net_store_length(char *packet,ulonglong length);
+char *net_store_length(char *packet,uint length);
+char *net_store_data(char *to,const char *from, uint length);
+char *net_store_data(char *to,int32 from);
+char *net_store_data(char *to,longlong from);