Commit 8f5e92e0 authored by unknown's avatar unknown
Browse files

Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-22687


libmysqld/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-item_uniq.cc:
  Auto merged
BitKeeper/deleted/.del-item_uniq.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents c1bcbe29 cdb60578

libmysqld/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
	hostname.cc init.cc password.c \

	item.cc item_buff.cc item_cmpfunc.cc item_create.cc \

	item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \

	item_geofunc.cc item_uniq.cc item_subselect.cc item_row.cc\

	item_geofunc.cc item_subselect.cc item_row.cc\

	item_xmlfunc.cc \

	key.cc lock.cc log.cc log_event.cc sql_state.c \

	protocol.cc net_serv.cc opt_range.cc \

mysql-test/r/parser.result

+6 −6
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp 
create table GROUP_CONCAT (a int);

drop table GROUP_CONCAT;

create table GROUP_UNIQUE_USERS(a int);

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GROUP_UNIQUE_USERS(a int)' at line 1

drop table GROUP_UNIQUE_USERS;

create table GROUP_UNIQUE_USERS (a int);

drop table GROUP_UNIQUE_USERS;

create table MAX(a int);
@@ -121,7 +121,7 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp 
create table TRIM (a int);

drop table TRIM;

create table UNIQUE_USERS(a int);

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNIQUE_USERS(a int)' at line 1

drop table UNIQUE_USERS;

create table UNIQUE_USERS (a int);

drop table UNIQUE_USERS;

create table VARIANCE(a int);
@@ -186,9 +186,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp 
create table GROUP_CONCAT (a int);

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GROUP_CONCAT (a int)' at line 1

create table GROUP_UNIQUE_USERS(a int);

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GROUP_UNIQUE_USERS(a int)' at line 1

drop table GROUP_UNIQUE_USERS;

create table GROUP_UNIQUE_USERS (a int);

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GROUP_UNIQUE_USERS (a int)' at line 1

drop table GROUP_UNIQUE_USERS;

create table MAX(a int);

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MAX(a int)' at line 1

create table MAX (a int);
@@ -258,9 +258,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp 
create table TRIM (a int);

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TRIM (a int)' at line 1

create table UNIQUE_USERS(a int);

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNIQUE_USERS(a int)' at line 1

drop table UNIQUE_USERS;

create table UNIQUE_USERS (a int);

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNIQUE_USERS (a int)' at line 1

drop table UNIQUE_USERS;

create table VARIANCE(a int);

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VARIANCE(a int)' at line 1

create table VARIANCE (a int);

mysql-test/t/parser.test

+10 −6
Original line number Diff line number Diff line
@@ -77,8 +77,9 @@ create table GROUP_CONCAT(a int); 
create table GROUP_CONCAT (a int);

drop table GROUP_CONCAT;



--error ER_PARSE_ERROR

# Limitation removed in 5.1

create table GROUP_UNIQUE_USERS(a int);

drop table GROUP_UNIQUE_USERS;

create table GROUP_UNIQUE_USERS (a int);

drop table GROUP_UNIQUE_USERS;
@@ -167,8 +168,9 @@ create table TRIM(a int); 
create table TRIM (a int);

drop table TRIM;



--error ER_PARSE_ERROR

# Limitation removed in 5.1

create table UNIQUE_USERS(a int);

drop table UNIQUE_USERS;

create table UNIQUE_USERS (a int);

drop table UNIQUE_USERS;
@@ -249,10 +251,11 @@ create table GROUP_CONCAT(a int); 
--error ER_PARSE_ERROR

create table GROUP_CONCAT (a int);



--error ER_PARSE_ERROR

# Limitation removed in 5.1

create table GROUP_UNIQUE_USERS(a int);

--error ER_PARSE_ERROR

drop table GROUP_UNIQUE_USERS;

create table GROUP_UNIQUE_USERS (a int);

drop table GROUP_UNIQUE_USERS;



--error ER_PARSE_ERROR

create table MAX(a int);
@@ -339,10 +342,11 @@ create table TRIM(a int); 
--error ER_PARSE_ERROR

create table TRIM (a int);



--error ER_PARSE_ERROR

# Limitation removed in 5.1

create table UNIQUE_USERS(a int);

--error ER_PARSE_ERROR

drop table UNIQUE_USERS;

create table UNIQUE_USERS (a int);

drop table UNIQUE_USERS;



--error ER_PARSE_ERROR

create table VARIANCE(a int);

sql/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ 
			$(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \

                        @yassl_libs@ @openssl_libs@

noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \

			item_strfunc.h item_timefunc.h item_uniq.h \

			item_strfunc.h item_timefunc.h \

			item_xmlfunc.h \

			item_create.h item_subselect.h item_row.h \

			mysql_priv.h item_geofunc.h sql_bitmap.h \
@@ -82,7 +82,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ 
			sql_base.cc table.cc sql_select.cc sql_insert.cc \

			sql_prepare.cc sql_error.cc sql_locale.cc \

			sql_update.cc sql_delete.cc uniques.cc sql_do.cc \

			procedure.cc item_uniq.cc sql_test.cc \

			procedure.cc sql_test.cc \

			log.cc log_event.cc init.cc derror.cc sql_acl.cc \

			unireg.cc des_key_file.cc \

			discover.cc time.cc opt_range.cc opt_sum.cc \

sql/item.h

+0 −1
Original line number Diff line number Diff line
@@ -2134,7 +2134,6 @@ class Item_int_with_ref :public Item_int 
#include "item_strfunc.h"

#include "item_geofunc.h"

#include "item_timefunc.h"

#include "item_uniq.h"

#include "item_subselect.h"

#include "item_xmlfunc.h"

#endif