Commit 68bd8af2 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


mysql-test/t/csv.test:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 2cc1c479 9c06a0b3

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1150,6 +1150,7 @@ libmysqld/sql_prepare.cc 
libmysqld/sql_rename.cc

libmysqld/sql_repl.cc

libmysqld/sql_select.cc

libmysqld/sql_servers.cc

libmysqld/sql_show.cc

libmysqld/sql_state.c

libmysqld/sql_string.cc

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/csv.result

+8 −0
Original line number Diff line number Diff line
@@ -5239,3 +5239,11 @@ id string 
0.67	string

9.67	string

drop table float_test;

CREATE TABLE `bug21328` (

`col1` int(11) DEFAULT NULL,

`col2` int(11) DEFAULT NULL,

`col3` int(11) DEFAULT NULL

) ENGINE=CSV;

insert into bug21328 values (1,NULL,NULL);

alter table bug21328 engine=myisam;

drop table bug21328;

mysql-test/r/log_tables.result

+0 −3
Original line number Diff line number Diff line
@@ -111,9 +111,6 @@ slow_log CREATE TABLE `slow_log` ( 
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'

alter table mysql.general_log engine=myisam;

alter table mysql.slow_log engine=myisam;

Warnings:

Warning	1366	Incorrect integer value: '' for column 'last_insert_id' at row 0

Warning	1366	Incorrect integer value: '' for column 'insert_id' at row 0

show create table mysql.general_log;

Table	Create Table

general_log	CREATE TABLE `general_log` (

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);