Commit 56261e0e authored by unknown's avatar unknown
Browse files

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new 

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/t/mysqldump.test:
  Manual merge.
sql/sql_show.cc:
  Manual merge.
parents c8e0b5e8 fad18fe9

config/ac-macros/plugins.m4

+4 −1
Original line number Diff line number Diff line
@@ -750,7 +750,10 @@ dnl --------------------------------------------------------------------------- 
AC_DEFUN([_MYSQL_INCLUDE_LIST],[

 ifelse([$1], [], [], [

  m4_define([__mysql_include__],[$1])

  sinclude($1)

  dnl We have to use builtin(), because sinclude would generate an error

  dnl "file $1 does not exists" in aclocal-1.8 - which is a bug, clearly

  dnl violating m4 specs, and which is fixed in aclocal-1.9

  builtin([include],$1)

  m4_undefine([__mysql_include__])

  _MYSQL_INCLUDE_LIST(m4_shift($@))

 ])

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.1.10-beta)

AM_INIT_AUTOMAKE(mysql, 5.1.11-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

include/my_base.h

+1 −1
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ enum ha_base_keytype { 
#define HA_ERR_WRONG_COMMAND	131	/* Command not supported */

#define HA_ERR_OLD_FILE		132	/* old databasfile */

#define HA_ERR_NO_ACTIVE_RECORD 133	/* No record read in update() */

#define HA_ERR_RECORD_DELETED	134	/* Intern error-code */

#define HA_ERR_RECORD_DELETED	134	/* A record is not there */

#define HA_ERR_RECORD_FILE_FULL 135	/* No more room in file */

#define HA_ERR_INDEX_FILE_FULL	136	/* No more room in file */

#define HA_ERR_END_OF_FILE	137	/* end in next/prev/first/last */

mysql-test/r/ansi.result

+7 −7
Original line number Diff line number Diff line
@@ -21,21 +21,21 @@ CREATE TABLE t1 (i int auto_increment NOT NULL, PRIMARY KEY (i)); 
SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `i` int(11) NOT NULL auto_increment,

  `i` int(11) NOT NULL AUTO_INCREMENT,

  PRIMARY KEY (`i`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

SET @@SQL_MODE="MYSQL323";

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `i` int(11) NOT NULL auto_increment,

  `i` int(11) NOT NULL AUTO_INCREMENT,

  PRIMARY KEY (`i`)

) TYPE=MyISAM

SET @@SQL_MODE="MYSQL40";

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `i` int(11) NOT NULL auto_increment,

  `i` int(11) NOT NULL AUTO_INCREMENT,

  PRIMARY KEY (`i`)

) TYPE=MyISAM

SET @@SQL_MODE="NO_FIELD_OPTIONS";

mysql-test/r/auto_increment.result

+3 −3
Original line number Diff line number Diff line
@@ -372,8 +372,8 @@ MySQL 1002 
SHOW CREATE TABLE `t1`;

Table	Create Table

t1	CREATE TABLE `t1` (

  `t1_name` varchar(255) default NULL,

  `t1_id` int(10) unsigned NOT NULL auto_increment,

  `t1_name` varchar(255) DEFAULT NULL,

  `t1_id` int(10) unsigned NOT NULL AUTO_INCREMENT,

  PRIMARY KEY (`t1_id`),

  KEY `t1_name` (`t1_name`)

) ENGINE=MyISAM AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1