database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt

Browse Source 
into  dl145s.mysql.com:/data0/mhansson/bug30942/my51-bug30942
This commit is contained in:
mhansson@dl145s.mysql.com
2007-10-05 15:20:56 +02:00
parent 02dacd20e8 e19efc0a6e
commit 122ea13767
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/information_schema.result
View File

@@ -1470,10 +1470,10 @@ f7 datetime NO NULL
f8 datetime YES 2006-01-01 00:00:00 f8 datetime YES 2006-01-01 00:00:00
drop table t1; drop table t1;
End of 5.0 tests. End of 5.0 tests.
show fields from information_schema.TABLE_NAMES; show fields from information_schema.table_names;
ERROR 42S02: Unknown table 'TABLE_NAMES' in information_schema ERROR 42S02: Unknown table 'table_names' in information_schema
show keys from information_schema.TABLE_NAMES; show keys from information_schema.table_names;
ERROR 42S02: Unknown table 'TABLE_NAMES' in information_schema ERROR 42S02: Unknown table 'table_names' in information_schema
select * from information_schema.engines WHERE ENGINE="MyISAM"; select * from information_schema.engines WHERE ENGINE="MyISAM";
ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS
MyISAM DEFAULT Default engine as of MySQL 3.23 with great performance NO NO NO MyISAM DEFAULT Default engine as of MySQL 3.23 with great performance NO NO NO

5
mysql-test/t/information_schema.test
View File

@@ -1095,10 +1095,9 @@ drop table t1;
# Bug#30079 A check for "hidden" I_S tables is flawed # Bug#30079 A check for "hidden" I_S tables is flawed
# #
--error 1109 --error 1109
show fields from information_schema.TABLE_NAMES; show fields from information_schema.table_names;
--error 1109 --error 1109
show keys from information_schema.TABLE_NAMES; show keys from information_schema.table_names;
# #
# Show engines # Show engines
# #

7
sql/ha_partition.cc
View File

@@ -2914,12 +2914,7 @@ void ha_partition::start_bulk_insert(ha_rows rows)
handler **file; handler **file;
DBUG_ENTER("ha_partition::start_bulk_insert"); DBUG_ENTER("ha_partition::start_bulk_insert");
if (!rows) rows= rows ? rows/m_tot_parts + 1 : 0;
{
/* Avoid allocation big caches in all underlaying handlers */
DBUG_VOID_RETURN;
}
rows= rows/m_tot_parts + 1;
file= m_file; file= m_file;
do do
{ {