mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-24 07:13:33 +03:00 
			
		
		
		
	Made year 2000 handling more uniform Removed year 2000 handling out from calc_days() The above removes some bugs in date/datetimes with year between 0 and 200 Now we get a note when we insert a datetime value into a date column For default values to CREATE, don't give errors for warning level NOTE Fixed some compiler failures Added library ws2_32 for windows compilation (needed if we want to compile with IOCP support) Removed duplicate typedef TIME and replaced it with MYSQL_TIME Better (more complete) fix for: Bug#21103 "DATE column not compared as DATE" Fixed properly Bug#18997 "DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value" Fixed Bug#23093 "Implicit conversion of 9912101 to date does not match cast(9912101 as date)" include/my_time.h: Removed not used define YY_MAGIC_BELOW Added prototype for year_2000_handling() mysql-test/r/date_formats.result: Updated results (fixed bug in date_format() with year < 99) mysql-test/r/func_sapdb.result: Added more testing of make_date() mysql-test/r/func_time.result: Fixed bug in date_sub() with years < 200 mysql-test/r/ps_2myisam.result: Now we get a note when we insert a datetime value into a date column mysql-test/r/ps_3innodb.result: Now we get a note when we insert a datetime value into a date column mysql-test/r/ps_4heap.result: Now we get a note when we insert a datetime value into a date column mysql-test/r/ps_5merge.result: Now we get a note when we insert a datetime value into a date column mysql-test/r/ps_7ndb.result: Now we get a note when we insert a datetime value into a date column mysql-test/r/type_date.result: Added test for date conversions mysql-test/r/type_datetime.result: Added testcase for datetime to date conversion. mysql-test/t/date_formats.test: Added testing of dates < 200 mysql-test/t/func_sapdb.test: More testing of makedate() mysql-test/t/type_date.test: Added test for date conversions mysql-test/t/type_datetime.test: Added testcase for datetime to date conversion. sql/CMakeLists.txt: Added library ws2_32 (needed if we want to compile with IOCP support) sql/event_data_objects.cc: TIME -> MYSQL_TIME sql/event_db_repository.cc: TIME -> MYSQL_TIME sql/event_queue.cc: TIME -> MYSQL_TIME sql/field.cc: Give note if we insert a datetime value in a date field Don't give notes if we are doing internal test conversions (like from convert_constant_item()) More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error)) Revert some changes in Field_newdate::store() to get more optimal code Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set. New parameters to make_truncated_value_warning() sql/field.h: TIME -> MYSQL_TIME sql/item.cc: New parameters to make_truncated_value_warning() Fixed get_date() to call number_to_datetime() if argument is not a string. Fixes Bug#23093 Implicit conversion of 9912101 to date does not match cast(9912101 as date) sql/item.h: TIME -> MYSQL_TIME sql/item_cmpfunc.cc: Don't print notes in convert_constant_item() sql/item_func.h: TIME -> MYSQL_TIME sql/item_timefunc.cc: New parameters to make_truncated_value_warning() Moved year 2000 handling out from calc_days() Don't return NULL for years < 200 in date_add/date_sub sql/item_timefunc.h: TIME -> MYSQL_TIME sql/my_decimal.cc: TIME -> MYSQL_TIME sql/my_decimal.h: TIME -> MYSQL_TIME sql/mysql_priv.h: Added error level to make_truncated_value_warning() sql/protocol.cc: TIME -> MYSQL_TIME sql/protocol.h: TIME -> MYSQL_TIME sql/sp.cc: TIME -> MYSQL_TIME sql/sql_base.cc: Make testing of result value of save_in_field() uniform sql-common/my_time.c: Added year_2000_handling() Removed year 2000 handling from calc_daynr() sql/sql_class.h: TIME -> MYSQL_TIME sql/sql_show.cc: TIME -> MYSQL_TIME sql/structs.h: TIME -> MYSQL_TIME sql/time.cc: Added error level to make_truncated_value_warning() sql/tztime.cc: TIME -> MYSQL_TIME sql/tztime.h: TIME -> MYSQL_TIME sql/unireg.cc: For default values to CREATE, don't give errors for warning level NOTE (Fixed failed CREATE when we give a datetime value to a date field) strings/ctype-utf8.c: Fixed compiler failures win/README: More comments
		
			
				
	
	
		
			185 lines
		
	
	
		
			6.2 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			185 lines
		
	
	
		
			6.2 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| /* Copyright (C) 2002-2006 MySQL 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; version 2 of the License.
 | |
| 
 | |
|    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 USE_PRAGMA_INTERFACE
 | |
| #pragma interface			/* gcc class implementation */
 | |
| #endif
 | |
| 
 | |
| 
 | |
| class i_string;
 | |
| class THD;
 | |
| typedef struct st_mysql_field MYSQL_FIELD;
 | |
| typedef struct st_mysql_rows MYSQL_ROWS;
 | |
| 
 | |
| class Protocol
 | |
| {
 | |
| protected:
 | |
|   THD	 *thd;
 | |
|   String *packet;
 | |
|   String *convert;
 | |
|   uint field_pos;
 | |
| #ifndef DBUG_OFF
 | |
|   enum enum_field_types *field_types;
 | |
| #endif
 | |
|   uint field_count;
 | |
| #ifndef EMBEDDED_LIBRARY
 | |
|   bool net_store_data(const char *from, uint length);
 | |
| #else
 | |
|   virtual bool net_store_data(const char *from, uint length);
 | |
|   char **next_field;
 | |
|   MYSQL_FIELD *next_mysql_field;
 | |
|   MEM_ROOT *alloc;
 | |
| #endif
 | |
|   bool store_string_aux(const char *from, uint length,
 | |
|                         CHARSET_INFO *fromcs, CHARSET_INFO *tocs);
 | |
| public:
 | |
|   Protocol() {}
 | |
|   Protocol(THD *thd_arg) { init(thd_arg); }
 | |
|   virtual ~Protocol() {}
 | |
|   void init(THD* thd_arg);
 | |
| 
 | |
|   enum { SEND_NUM_ROWS= 1, SEND_DEFAULTS= 2, SEND_EOF= 4 };
 | |
|   virtual bool send_fields(List<Item> *list, uint flags);
 | |
| 
 | |
|   bool store(I_List<i_string> *str_list);
 | |
|   bool store(const char *from, CHARSET_INFO *cs);
 | |
|   String *storage_packet() { return packet; }
 | |
|   inline void free() { packet->free(); }
 | |
|   virtual bool write();
 | |
|   inline  bool store(int from)
 | |
|   { return store_long((longlong) from); }
 | |
|   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); }
 | |
|   inline bool store(String *str)
 | |
|   { return store((char*) str->ptr(), str->length(), str->charset()); }
 | |
| 
 | |
|   virtual bool prepare_for_send(List<Item> *item_list) 
 | |
|   {
 | |
|     field_count=item_list->elements;
 | |
|     return 0;
 | |
|   }
 | |
|   virtual bool flush();
 | |
|   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_decimal(const my_decimal *)=0;
 | |
|   virtual bool store(const char *from, uint length, CHARSET_INFO *cs)=0;
 | |
|   virtual bool store(const char *from, uint length, 
 | |
|   		     CHARSET_INFO *fromcs, CHARSET_INFO *tocs)=0;
 | |
|   virtual bool store(float from, uint32 decimals, String *buffer)=0;
 | |
|   virtual bool store(double from, uint32 decimals, String *buffer)=0;
 | |
|   virtual bool store(MYSQL_TIME *time)=0;
 | |
|   virtual bool store_date(MYSQL_TIME *time)=0;
 | |
|   virtual bool store_time(MYSQL_TIME *time)=0;
 | |
|   virtual bool store(Field *field)=0;
 | |
| #ifdef EMBEDDED_LIBRARY
 | |
|   int begin_dataset();
 | |
|   virtual void remove_last_row() {}
 | |
| #else
 | |
|   void remove_last_row() {}
 | |
| #endif
 | |
|   enum enum_protocol_type
 | |
|   {
 | |
|     PROTOCOL_TEXT= 0, PROTOCOL_BINARY= 1
 | |
|     /*
 | |
|       before adding here or change the values, consider that it is cast to a
 | |
|       bit in sql_cache.cc.
 | |
|     */
 | |
|   };
 | |
|   virtual enum enum_protocol_type type()= 0;
 | |
| };
 | |
| 
 | |
| 
 | |
| /* Class used for the old (MySQL 4.0 protocol) */
 | |
| 
 | |
| class Protocol_text :public Protocol
 | |
| {
 | |
| public:
 | |
|   Protocol_text() {}
 | |
|   Protocol_text(THD *thd_arg) :Protocol(thd_arg) {}
 | |
|   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_decimal(const my_decimal *);
 | |
|   virtual bool store(const char *from, uint length, CHARSET_INFO *cs);
 | |
|   virtual bool store(const char *from, uint length,
 | |
|   		     CHARSET_INFO *fromcs, CHARSET_INFO *tocs);
 | |
|   virtual bool store(MYSQL_TIME *time);
 | |
|   virtual bool store_date(MYSQL_TIME *time);
 | |
|   virtual bool store_time(MYSQL_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);
 | |
| #ifdef EMBEDDED_LIBRARY
 | |
|   void remove_last_row();
 | |
| #endif
 | |
|   virtual enum enum_protocol_type type() { return PROTOCOL_TEXT; };
 | |
| };
 | |
| 
 | |
| 
 | |
| class Protocol_binary :public Protocol
 | |
| {
 | |
| private:
 | |
|   uint bit_fields;
 | |
| public:
 | |
|   Protocol_binary() {}
 | |
|   Protocol_binary(THD *thd_arg) :Protocol(thd_arg) {}
 | |
|   virtual bool prepare_for_send(List<Item> *item_list);
 | |
|   virtual void prepare_for_resend();
 | |
| #ifdef EMBEDDED_LIBRARY
 | |
|   virtual bool write();
 | |
|   bool net_store_data(const char *from, uint length);
 | |
| #endif
 | |
|   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_decimal(const my_decimal *);
 | |
|   virtual bool store(const char *from,uint length, CHARSET_INFO *cs);
 | |
|   virtual bool store(const char *from, uint length,
 | |
|   		     CHARSET_INFO *fromcs, CHARSET_INFO *tocs);
 | |
|   virtual bool store(MYSQL_TIME *time);
 | |
|   virtual bool store_date(MYSQL_TIME *time);
 | |
|   virtual bool store_time(MYSQL_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);
 | |
|   virtual enum enum_protocol_type type() { return PROTOCOL_BINARY; };
 | |
| };
 | |
| 
 | |
| void send_warning(THD *thd, uint sql_errno, const char *err=0);
 | |
| void net_printf_error(THD *thd, uint sql_errno, ...);
 | |
| void net_send_error(THD *thd, uint sql_errno=0, const char *err=0);
 | |
| void send_ok(THD *thd, ha_rows affected_rows=0L, ulonglong id=0L,
 | |
| 	     const char *info=0);
 | |
| void send_eof(THD *thd);
 | |
| bool send_old_password_request(THD *thd);
 | |
| 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);
 | |
| 
 |