Commit 565fe180 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql

parents 0f25a1a0 6f669e6b

include/mysqld_error.h

+2 −1
Original line number Diff line number Diff line
@@ -214,4 +214,5 @@ 
#define ER_NO_PERMISSON_TO_CREATE_USER 1211

#define ER_UNION_TABLES_IN_DIFFERENT_DIR 1212

#define ER_LOCK_DEADLOCK 1213

#define ER_ERROR_MESSAGES 214
 
#define ER_TABLE_CANT_HANDLE_FULLTEXT 1214

#define ER_ERROR_MESSAGES 215

libmysql/violite.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <sys/ioctl.h>

#endif



#if !defined(MSDOS) && !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__)

#if !defined(MSDOS) && !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) && !defined(__FreeBSD__)

#include <netinet/ip.h>

#if !defined(alpha_linux_port)

#include <netinet/tcp.h>

sql/ha_berkeley.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ class ha_berkeley: public handler 
		    HA_REC_NOT_IN_SEQ |

		    HA_KEYPOS_TO_RNDPOS | HA_READ_ORDER | HA_LASTKEY_ORDER |

		    HA_LONGLONG_KEYS | HA_NULL_KEY | HA_HAVE_KEY_READ_ONLY |

		    HA_BLOB_KEY | HA_NOT_EXACT_COUNT |

		    HA_BLOB_KEY | HA_NOT_EXACT_COUNT | HA_NO_FULLTEXT_KEY |

		    HA_PRIMARY_KEY_IN_READ_INDEX | HA_DROP_BEFORE_CREATE |

		    HA_AUTO_PART_KEY),

    changed_rows(0),last_dup_key((uint) -1),version(0),using_ignore(0)

sql/ha_heap.h

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ class ha_heap: public handler 
  ulong option_flag() const

  { return (HA_READ_RND_SAME | HA_NO_INDEX | HA_ONLY_WHOLE_INDEX |

	    HA_WRONG_ASCII_ORDER | HA_KEYPOS_TO_RNDPOS | HA_NO_BLOBS |

	    HA_REC_NOT_IN_SEQ); }

	    HA_REC_NOT_IN_SEQ | HA_NO_FULLTEXT_KEY); }

  uint max_record_length() const { return HA_MAX_REC_LENGTH; }

  uint max_keys()          const { return MAX_KEY; }

  uint max_key_parts()     const { return MAX_REF_PARTS; }

sql/ha_innobase.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ class ha_innobase: public handler 
			  HA_KEYPOS_TO_RNDPOS | HA_LASTKEY_ORDER |

			  HA_HAVE_KEY_READ_ONLY | HA_READ_NOT_EXACT_KEY |

			  HA_LONGLONG_KEYS | HA_NULL_KEY |

			  HA_NOT_EXACT_COUNT |

			  HA_NOT_EXACT_COUNT | HA_NO_FULLTEXT_KEY |

			  HA_NO_WRITE_DELAYED |

			  HA_PRIMARY_KEY_IN_READ_INDEX |

			  HA_DROP_BEFORE_CREATE |