Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
4d29b85d
Commit
4d29b85d
authored
Sep 13, 2005
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merged from 4.1 to 5.0.
parent
b33da62c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
mysql-test/r/create.result
mysql-test/r/create.result
+9
-8
mysql-test/r/innodb.result
mysql-test/r/innodb.result
+1
-1
sql/item_cmpfunc.cc
sql/item_cmpfunc.cc
+1
-2
No files found.
mysql-test/r/create.result
View file @
4d29b85d
...
@@ -278,16 +278,16 @@ create table t1 (a int not null, b int, primary key (a));
...
@@ -278,16 +278,16 @@ create table t1 (a int not null, b int, primary key (a));
insert into t1 values (1,1);
insert into t1 values (1,1);
create table if not exists t1 select 2;
create table if not exists t1 select 2;
Warnings:
Warnings:
Warning 1364 Field 'a' doesn't have a default value
Note 1050 Table 't1' already exists
Note 1050 Table 't1' already exists
Warning 1364 Field 'a' doesn't have a default value
select * from t1;
select * from t1;
a b
a b
1 1
1 1
0 2
0 2
create table if not exists t1 select 3 as 'a',4 as 'b';
create table if not exists t1 select 3 as 'a',4 as 'b';
Warnings:
Warnings:
Warning 1364 Field 'a' doesn't have a default value
Note 1050 Table 't1' already exists
Note 1050 Table 't1' already exists
Warning 1364 Field 'a' doesn't have a default value
create table if not exists t1 select 3 as 'a',3 as 'b';
create table if not exists t1 select 3 as 'a',3 as 'b';
ERROR 23000: Duplicate entry '3' for key 1
ERROR 23000: Duplicate entry '3' for key 1
select * from t1;
select * from t1;
...
@@ -621,6 +621,13 @@ create table test.t1 like x;
...
@@ -621,6 +621,13 @@ create table test.t1 like x;
ERROR 42000: Incorrect database name 'NULL'
ERROR 42000: Incorrect database name 'NULL'
drop table if exists test.t1;
drop table if exists test.t1;
create database mysqltest;
create database mysqltest;
use mysqltest;
create view v1 as select 'foo' from dual;
create table t1 like v1;
ERROR HY000: 'mysqltest.v1' is not BASE TABLE
drop view v1;
drop database mysqltest;
create database mysqltest;
create database if not exists mysqltest character set latin2;
create database if not exists mysqltest character set latin2;
Warnings:
Warnings:
Note 1007 Can't create database 'mysqltest'; database exists
Note 1007 Can't create database 'mysqltest'; database exists
...
@@ -634,9 +641,3 @@ create table if not exists t1 (a int);
...
@@ -634,9 +641,3 @@ create table if not exists t1 (a int);
Warnings:
Warnings:
Note 1050 Table 't1' already exists
Note 1050 Table 't1' already exists
drop table t1;
drop table t1;
use mysqltest;
create view v1 as select 'foo' from dual;
create table t1 like v1;
ERROR HY000: 'mysqltest.v1' is not BASE TABLE
drop view v1;
drop database mysqltest;
mysql-test/r/innodb.result
View file @
4d29b85d
...
@@ -1776,7 +1776,7 @@ Variable_name Value
...
@@ -1776,7 +1776,7 @@ Variable_name Value
Innodb_rows_deleted 2070
Innodb_rows_deleted 2070
show status like "Innodb_rows_inserted";
show status like "Innodb_rows_inserted";
Variable_name Value
Variable_name Value
Innodb_rows_inserted 3172
2
Innodb_rows_inserted 3172
5
show status like "Innodb_rows_updated";
show status like "Innodb_rows_updated";
Variable_name Value
Variable_name Value
Innodb_rows_updated 29530
Innodb_rows_updated 29530
...
...
sql/item_cmpfunc.cc
View file @
4d29b85d
...
@@ -1017,8 +1017,7 @@ longlong Item_func_interval::val_int()
...
@@ -1017,8 +1017,7 @@ longlong Item_func_interval::val_int()
1 got error
1 got error
*/
*/
bool
Item_func_between
::
fix_fields
(
THD
*
thd
,
struct
st_table_list
*
tables
,
bool
Item_func_between
::
fix_fields
(
THD
*
thd
,
Item
**
ref
)
Item
**
ref
)
{
{
if
(
Item_func_opt_neg
::
fix_fields
(
thd
,
ref
))
if
(
Item_func_opt_neg
::
fix_fields
(
thd
,
ref
))
return
1
;
return
1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment