database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

mysql-test/suite/funcs_1/r/storedproc.result:

Browse Source 
Fixed test failure
mysql-test/suite/funcs_1/t/storedproc.test:
  Fixed test failure
  (The error changed as syntax for alter changed with ALTER ONLINE)
storage/maria/ha_maria.cc:
  fixed compiler warning
This commit is contained in:
Michael Widenius
2011-05-02 13:25:53 +03:00
parent 80b0b300f6
commit 35352d4da6
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/funcs_1/r/storedproc.result
View File

@@ -3942,7 +3942,9 @@ CREATE PROCEDURE sp1()
alter:BEGIN
SELECT @x;
END//
ERROR 0A000: ALTER VIEW is not allowed in stored procedures
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN
SELECT @x;
END' at line 2
DROP PROCEDURE IF EXISTS sp1;
CREATE PROCEDURE sp1()
analyze:BEGIN

2
mysql-test/suite/funcs_1/t/storedproc.test
View File

@@ -3082,7 +3082,7 @@ DROP PROCEDURE IF EXISTS sp1;
--enable_warnings
delimiter //;
--error ER_SP_BADSTATEMENT
--error ER_PARSE_ERROR
CREATE PROCEDURE sp1()
alter:BEGIN
SELECT @x;

5
storage/maria/ha_maria.cc
View File

@@ -1967,7 +1967,7 @@ void ha_maria::start_bulk_insert(ha_rows rows)
/* don't enable row cache if too few rows */
if (!rows || (rows > MARIA_MIN_ROWS_TO_USE_WRITE_CACHE))
{
size_t size= thd->variables.read_buff_size;
ulonglong size= thd->variables.read_buff_size, tmp;
if (rows)
{
if (file->state->records)
@@ -1979,7 +1979,8 @@ void ha_maria::start_bulk_insert(ha_rows rows)
else if (table->s->avg_row_length)
set_if_smaller(size, (size_t) (table->s->avg_row_length * rows));
}
maria_extra(file, HA_EXTRA_WRITE_CACHE, (void*) &size);
tmp= (ulong) size; // Safe becasue of limits
maria_extra(file, HA_EXTRA_WRITE_CACHE, (void*) &tmp);
}
can_enable_indexes= (maria_is_all_keys_active(share->state.key_map,