mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
This commit is contained in:
@@ -1,21 +1,4 @@
|
|||||||
drop table if exists t1;
|
drop table if exists t1, t2, t3, t4, t5, t6;
|
||||||
Warnings:
|
|
||||||
Note 1051 Unknown table 't1'
|
|
||||||
drop table if exists t2;
|
|
||||||
Warnings:
|
|
||||||
Note 1051 Unknown table 't2'
|
|
||||||
drop table if exists t3;
|
|
||||||
Warnings:
|
|
||||||
Note 1051 Unknown table 't3'
|
|
||||||
drop table if exists t4;
|
|
||||||
Warnings:
|
|
||||||
Note 1051 Unknown table 't4'
|
|
||||||
drop table if exists t5;
|
|
||||||
Warnings:
|
|
||||||
Note 1051 Unknown table 't5'
|
|
||||||
drop table if exists t6;
|
|
||||||
Warnings:
|
|
||||||
Note 1051 Unknown table 't6'
|
|
||||||
create table t1 (id int(8), name varchar(32));
|
create table t1 (id int(8), name varchar(32));
|
||||||
create table t2 (id int(8), name varchar(32)) ENGINE="MyISAM";
|
create table t2 (id int(8), name varchar(32)) ENGINE="MyISAM";
|
||||||
create table t3 (id int(8), name varchar(32)) ENGINE="MEMORY";
|
create table t3 (id int(8), name varchar(32)) ENGINE="MEMORY";
|
||||||
|
@@ -74,8 +74,6 @@ get_lock("bug12480",2)
|
|||||||
1
|
1
|
||||||
create table t1 (a datetime,b datetime, c datetime);
|
create table t1 (a datetime,b datetime, c datetime);
|
||||||
drop function if exists bug12480;
|
drop function if exists bug12480;
|
||||||
Warnings:
|
|
||||||
Note 1305 FUNCTION bug12480 does not exist
|
|
||||||
create function bug12480() returns datetime
|
create function bug12480() returns datetime
|
||||||
begin
|
begin
|
||||||
set @a=get_lock("bug12480",2);
|
set @a=get_lock("bug12480",2);
|
||||||
|
@@ -978,8 +978,6 @@ t1 CREATE TABLE `t1` (
|
|||||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||||
drop table t1;
|
drop table t1;
|
||||||
drop procedure if exists wg2;
|
drop procedure if exists wg2;
|
||||||
Warnings:
|
|
||||||
Note 1305 PROCEDURE wg2 does not exist
|
|
||||||
create procedure wg2()
|
create procedure wg2()
|
||||||
begin
|
begin
|
||||||
declare v int default 1;
|
declare v int default 1;
|
||||||
|
@@ -3,14 +3,9 @@
|
|||||||
--source include/have_innodb.inc
|
--source include/have_innodb.inc
|
||||||
--source include/have_archive.inc
|
--source include/have_archive.inc
|
||||||
|
|
||||||
--disable-warnings
|
--disable_warnings
|
||||||
drop table if exists t1;
|
drop table if exists t1, t2, t3, t4, t5, t6;
|
||||||
drop table if exists t2;
|
--enable_warnings
|
||||||
drop table if exists t3;
|
|
||||||
drop table if exists t4;
|
|
||||||
drop table if exists t5;
|
|
||||||
drop table if exists t6;
|
|
||||||
--enable-warnings
|
|
||||||
|
|
||||||
create table t1 (id int(8), name varchar(32));
|
create table t1 (id int(8), name varchar(32));
|
||||||
create table t2 (id int(8), name varchar(32)) ENGINE="MyISAM";
|
create table t2 (id int(8), name varchar(32)) ENGINE="MyISAM";
|
||||||
|
@@ -70,7 +70,7 @@ select get_lock("bug12480",2);
|
|||||||
connection default;
|
connection default;
|
||||||
|
|
||||||
create table t1 (a datetime,b datetime, c datetime);
|
create table t1 (a datetime,b datetime, c datetime);
|
||||||
--ignore_warnings
|
--disable_warnings
|
||||||
drop function if exists bug12480;
|
drop function if exists bug12480;
|
||||||
--enable_warnings
|
--enable_warnings
|
||||||
|
|
||||||
|
@@ -1000,9 +1000,9 @@ drop table t1;
|
|||||||
#
|
#
|
||||||
# Bug 12938 (arithmetic loop's zero)
|
# Bug 12938 (arithmetic loop's zero)
|
||||||
#
|
#
|
||||||
--disable-warnings
|
--disable_warnings
|
||||||
drop procedure if exists wg2;
|
drop procedure if exists wg2;
|
||||||
--enable-warnings
|
--enable_warnings
|
||||||
delimiter //;
|
delimiter //;
|
||||||
create procedure wg2()
|
create procedure wg2()
|
||||||
begin
|
begin
|
||||||
|
Reference in New Issue
Block a user