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
2e79201c
Commit
2e79201c
authored
Nov 25, 2005
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Post-merge fixes.
parent
61e454c0
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
12 deletions
+38
-12
mysql-test/r/ndb_basic.result
mysql-test/r/ndb_basic.result
+4
-4
mysql-test/r/ps.result
mysql-test/r/ps.result
+19
-0
mysql-test/r/select.result
mysql-test/r/select.result
+8
-0
sql/sql_table.cc
sql/sql_table.cc
+7
-8
No files found.
mysql-test/r/ndb_basic.result
View file @
2e79201c
...
...
@@ -667,13 +667,13 @@ counter datavalue
57 newval
58 newval
drop table t1;
CREATE TABLE t1 ( b INT ) PACK_KEYS = 0 ENGINE = ndb;
select * from t1;
b
drop table t1;
create table atablewithareallylongandirritatingname (a int);
insert into atablewithareallylongandirritatingname values (2);
select * from atablewithareallylongandirritatingname;
a
2
drop table atablewithareallylongandirritatingname;
CREATE TABLE t1 ( b INT ) PACK_KEYS = 0 ENGINE = ndb;
select * from t1;
b
drop table t1;
mysql-test/r/ps.result
View file @
2e79201c
...
...
@@ -806,3 +806,22 @@ execute stmt;
@@tx_isolation
REPEATABLE-READ
deallocate prepare stmt;
prepare stmt from "create temporary table t1 (letter enum('','a','b','c')
not null)";
execute stmt;
drop table t1;
execute stmt;
drop table t1;
execute stmt;
drop table t1;
set names latin1;
prepare stmt from "create table t1 (a enum('test') default 'test')
character set utf8";
execute stmt;
drop table t1;
execute stmt;
drop table t1;
execute stmt;
drop table t1;
set names default;
deallocate prepare stmt;
mysql-test/r/select.result
View file @
2e79201c
...
...
@@ -2708,6 +2708,14 @@ select distinct count(f2) >0 from t1 left join t2 on f1=f3 group by f1;
count(f2) >0
1
drop table t1,t2;
create table t1 (f1 int,f2 int);
insert into t1 values(1,1);
create table t2 (f3 int, f4 int, primary key(f3,f4));
insert into t2 values(1,1);
select * from t1 where f1 in (select f3 from t2 where (f3,f4)= (select f3,f4 from t2));
f1 f2
1 1
drop table t1,t2;
CREATE TABLE t1 ( city char(30) );
INSERT INTO t1 VALUES ('London');
INSERT INTO t1 VALUES ('Paris');
...
...
sql/sql_table.cc
View file @
2e79201c
...
...
@@ -729,7 +729,7 @@ static int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info,
Create the typelib in prepared statement memory if we're
executing one.
*/
MEM_ROOT
*
stmt_root
=
thd
->
curren
t_arena
->
mem_root
;
MEM_ROOT
*
stmt_root
=
thd
->
stm
t_arena
->
mem_root
;
interval
=
sql_field
->
interval
=
typelib
(
stmt_root
,
sql_field
->
interval_list
);
...
...
@@ -763,21 +763,20 @@ static int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info,
*/
if
(
sql_field
->
def
&&
cs
!=
sql_field
->
def
->
collation
.
collation
)
{
Item_arena
backup_arena
;
bool
need_to_change_arena
=
!
thd
->
current_arena
->
is_conventional_execution
();
Query_arena
backup_arena
;
bool
need_to_change_arena
=
!
thd
->
stmt_arena
->
is_conventional
();
if
(
need_to_change_arena
)
{
/* Asser that we don't do that at every PS execute */
DBUG_ASSERT
(
thd
->
curren
t_arena
->
is_first_stmt_execute
()
||
thd
->
curren
t_arena
->
is_first_sp_execute
());
thd
->
set_n_backup_
item_arena
(
thd
->
curren
t_arena
,
&
backup_arena
);
DBUG_ASSERT
(
thd
->
stm
t_arena
->
is_first_stmt_execute
()
||
thd
->
stm
t_arena
->
is_first_sp_execute
());
thd
->
set_n_backup_
active_arena
(
thd
->
stm
t_arena
,
&
backup_arena
);
}
sql_field
->
def
=
sql_field
->
def
->
safe_charset_converter
(
cs
);
if
(
need_to_change_arena
)
thd
->
restore_
backup_item_arena
(
thd
->
curren
t_arena
,
&
backup_arena
);
thd
->
restore_
active_arena
(
thd
->
stm
t_arena
,
&
backup_arena
);
if
(
!
sql_field
->
def
)
{
...
...
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