Commit 919d0d85 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/dlenev/mysql-5.1-merges


configure.in:
  Auto merged
parents 157a6470 b98431a0

.bzrignore

+7 −0
Original line number Diff line number Diff line
@@ -1748,3 +1748,10 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj

mysql-test/r/backup.log

mysql-test/r/events.log

mysql-test/r/events_bugs.log

mysql-test/r/events_logs_tests.log

mysql-test/r/mysqltest.log

mysql-test/r/symlink.log

mysql-test/r/system_mysql_db.log

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.8-beta)

AM_INIT_AUTOMAKE(mysql, 5.1.9-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

mysql-test/lib/init_db.sql

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ DROP PROCEDURE create_log_tables; 


CREATE TABLE event (

  db char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',

  name char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',

  name char(64) CHARACTER SET utf8 NOT NULL default '',

  body longblob NOT NULL,

  definer char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',

  execute_at DATETIME default NULL,

mysql-test/r/events.result

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ SHOW CREATE TABLE mysql.event; 
Table	Create Table

event	CREATE TABLE `event` (

  `db` char(20) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',

  `name` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',

  `name` char(64) NOT NULL DEFAULT '',

  `body` longblob NOT NULL,

  `definer` char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',

  `execute_at` datetime DEFAULT NULL,

mysql-test/r/events_bugs.result

+15 −0
Original line number Diff line number Diff line 
create database if not exists events_test;

use events_test;

CREATE EVENT lower_case ON SCHEDULE EVERY 1 MINUTE DO SELECT 1;

CREATE EVENT Lower_case ON SCHEDULE EVERY 2 MINUTE DO SELECT 2;

ERROR HY000: Event 'Lower_case' already exists

DROP EVENT Lower_case;

SET NAMES cp1251;

CREATE EVENT äîëåí_ðåãèñòúð_1251 ON SCHEDULE EVERY 1 YEAR DO SELECT 100;

CREATE EVENT ÄîËåÍ_ðåãèñòúð_1251 ON SCHEDULE EVERY 2 YEAR DO SELECT 200;

ERROR HY000: Event 'ДоЛеН_регистър_1251' already exists

DROP EVENT ÄîËåÍ_ðåãèñòúð_1251;

SET NAMES utf8;

CREATE EVENT долен_регистър_утф8 ON SCHEDULE EVERY 3 YEAR DO SELECT 300;

CREATE EVENT ДОЛЕН_регистър_утф8 ON SCHEDULE EVERY 4 YEAR DO SELECT 400;

ERROR HY000: Event 'ДОЛЕН_регистър_утф8' already exists

DROP EVENT ДОЛЕН_регистър_утф8;

SET NAMES latin1;

set @a=3;

CREATE PROCEDURE p_16 () CREATE EVENT e_16 ON SCHEDULE EVERY @a SECOND DO SET @a=5;

call p_16();