Commit e44e344c authored by unknown's avatar unknown
Browse files

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

into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge


sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/sp.result:
  Manual merge.
mysql-test/r/udf.result:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
mysql-test/t/udf.test:
  Manual merge.
parents a0efaba3 1cf65f31

client/mysql.cc

+2 −1
Original line number Diff line number Diff line
@@ -1221,7 +1221,8 @@ static bool add_line(String &buffer,char *line,char *in_string, 
      continue;

    }

#endif

    if (!*ml_comment && inchar == '\\')

    if (!*ml_comment && inchar == '\\' &&

        !(mysql.server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES))

    {

      // Found possbile one character command like \c

client/mysqltest.c

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ static void die(const char *fmt, ...) 
    if (cur_file && cur_file != file_stack)

      fprintf(stderr, "In included file \"%s\": ",

              cur_file->file_name);

    if (start_lineno != 0)

    if (start_lineno > 0)

      fprintf(stderr, "At line %u: ", start_lineno);

    vfprintf(stderr, fmt, args);

    fprintf(stderr, "\n");

mysql-test/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ install-data-local: 
	$(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include

	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.*001 $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.pem $(DESTDIR)$(testdir)/std_data

mysql-test/r/create.result

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ t2 CREATE TABLE `t2` ( 
  `ifnull(h,h)` decimal(5,4) default NULL,

  `ifnull(i,i)` year(4) default NULL,

  `ifnull(j,j)` date default NULL,

  `ifnull(k,k)` datetime NOT NULL default '0000-00-00 00:00:00',

  `ifnull(k,k)` timestamp NOT NULL default '0000-00-00 00:00:00',

  `ifnull(l,l)` datetime default NULL,

  `ifnull(m,m)` varchar(1) default NULL,

  `ifnull(n,n)` varchar(3) default NULL,

mysql-test/r/func_gconcat.result

+13 −0
Original line number Diff line number Diff line
@@ -641,3 +641,16 @@ select charset(group_concat(c1 order by c2)) from t1; 
charset(group_concat(c1 order by c2))

latin1

drop table t1;

CREATE TABLE t1 (a INT(10), b LONGTEXT, PRIMARY KEY (a));

SET GROUP_CONCAT_MAX_LEN = 20000000;

INSERT INTO t1 VALUES (1,REPEAT(CONCAT('A',CAST(CHAR(0) AS BINARY),'B'), 40000));

INSERT INTO t1 SELECT a + 1, b FROM t1;

SELECT a, CHAR_LENGTH(b) FROM t1;

a	CHAR_LENGTH(b)

1	120000

2	120000

SELECT CHAR_LENGTH( GROUP_CONCAT(b) ) FROM t1;

CHAR_LENGTH( GROUP_CONCAT(b) )

240001

SET GROUP_CONCAT_MAX_LEN = 1024;

DROP TABLE t1;