overwrites IN variable
and added error checking of variables for [IN]OUT parameters while
rewriting the out parameter handling.
mysql-test/r/sp-error.result:
New test case for non-variable argument for [IN]OUT parameters.
(And changed to qualified names in some other error messages.)
mysql-test/r/sp.result:
New test case for BUG#9598.
mysql-test/t/sp-error.test:
New test case for non-variable argument for [IN]OUT parameters.
mysql-test/t/sp.test:
New test case for BUG#9598.
sql/item.h:
Need to distinguish between SP local variable items and other items,
for error checking and [IN]OUT parameter handling.
sql/share/errmsg.txt:
New error message for non-variable arguments for [IN]OUT parameters in stored procedures.
sql/sp_head.cc:
Rewrote the [IN]OUT parameter handling in procedure invokation, to make
it work properly when using user variables in sub-calls.
Also added error checking for non-variable arguments for such parameters
(and changed to qualified names for wrong number of arg. errors).
sql/sp_rcontext.cc:
No need to keep track on the out index for an [IN]OUT parameter any more.
sql/sp_rcontext.h:
No need to keep track on the out index for an [IN]OUT parameter any more.
Added a test in connection with the fix for
bug #6106.
view.result, view.test:
Added test cases for bugs #6106/6107.
sql_show.cc:
The addition of the case for items of the type REF_ITEM in the
function uses_only_table_name_fields became necessary after
the fix for bug #6106.
sql_base.cc:
The problem was due to the fact that two different column
references were glued together though one of them belonged to
a subquery while another to an outer query. This caused
eventually a wrong calculation of values for the used_tables
attribute.
sql/sql_base.cc:
The problem was due to the fact that two different column
references were glued together though one of them belonged to
a subquery while another to an outer query. This caused
eventually a wrong calculation of values for the used_tables
attribute.
sql/sql_show.cc:
The addition of the case for items of the type REF_ITEM in the
function uses_only_table_name_fields became necessary after
the fix for bug #6106.
mysql-test/t/view.test:
Added test cases for bugs #6106/6107.
mysql-test/r/view.result:
Added test cases for bugs #6106/6107.
mysql-test/t/information_schema.test:
Added a test in connection with the fix for
bug #6106.
mysql-test/r/information_schema.result:
Added a test in connection with the fix for
bug #6106.
mysql-test/r/ps.result:
Test results: adding tests for CALL statement in prepared mode.
mysql-test/t/ps.test:
Adding tests for CALL statement in prepared mode.
innobase/fil/fil0fil.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/t/ctype_ucs_binlog.test:
Auto merged
causes system crash.
mysql-test/r/sp.result:
Added test case for BUG#9674.
mysql-test/t/sp.test:
Added test case for BUG#9674.
sql/item.cc:
Returning a pointer to a local variable is not a good idea.
Better to use parameter which is there for exactly this purpose.
mysql-test/r/sp.result:
Added test case for BUG#6129.
mysql-test/t/sp.test:
Added test case for BUG#6129.
sql/sp_pcontext.h:
Only need one handler counter.
sql/sql_yacc.yy:
Count handlers correctly.
mysql-test/r/sp.result:
Added testcase for BUG#6129: Check that sql_mode is really set in mysql.proc.
mysql-test/t/sp.test:
Added testcase for BUG#6129: Check that sql_mode is really set in mysql.proc.
mysql-test/mysql-test-run.pl:
1. Improved description of option user=USER
2. Bug fix
The storage place of the old, to be removed <test case>.reject file is the 'r' subdirectory of the test suite.
3. New option "start-dirty" which is
- per functionality a "start-and-exit" without an initiation
- a convenient method to (re)start an existing database.
So a following
./mysql-test-run.pl --extern ......
will meet a server running with the default ports and sockets according to our test environment.
This option is useful for analyzing bugs and WL#2520 Upgrade/Downgrade Test Plan .
correct result after bugfix
sql/sql_class.cc
initialize net.query_cache_query
mysql-test/r/flush_block_commit.result:
correct result after bugfix
sql/sql_class.cc:
initialize net.query_cache_query
sql/sql_yacc.yy:
oops
mysql-test/r/flush_block_commit.result:
FLUSH TABLES WITH READ LOCK should block writes to binlog too
it does not yet
mysql-test/t/flush_block_commit.test:
FLUSH TABLES WITH READ LOCK should block writes to binlog too
it does not yet
mysql-test/r/sp.result:
Added test case for BUG#7185.
mysql-test/t/sp.test:
Added test case for BUG#7185.
sql/sql_yacc.yy:
Allow non-reserved words as stored procedure names.
- If number of records in table is 4, the calculated cost for using "index" and "range" become so close so that any rounding errors becomes visible.
- Added one more record to the tables for heap test and expoect "range" to be selected
- Decrease number of records in t1 for range and expect "index" to be choosen.
mysql-test/r/heap.result:
Add one more record to table t1 and expect explain to use "range"
mysql-test/r/heap_btree.result:
Add one more record to table t1 and expect explain to use "range"
mysql-test/r/heap_hash.result:
Add one more record to table t1 and expect explain to use "range"
mysql-test/r/range.result:
Update results
mysql-test/t/heap.test:
Add one more record to table t1 and expect explain to use "range"
mysql-test/t/heap_btree.test:
Add one more record to table t1 and expect explain to use "range"
mysql-test/t/heap_hash.test:
Add one more record to table t1 in order for optimizer to select use of "range" deterministic
mysql-test/t/range.test:
Remove one record from table t1 to avoid that cost for "index" and "range" are so close that rounding error become visible.
into mdk10.(none):/home/reggie/bk/mysql-5.0
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/item_create.cc:
Auto merged
sql/mysqld.cc:
Auto merged
mysql-test/r/ctype_collate.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/union.test:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/sql_table.cc:
Auto merged
into mysql.com:/home/dlenev/src/mysql-4.1-merges
sql/item_create.cc:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
function".
We should not cache queries using CURRENT_USER() function as we do it
for some other functions, e.g. USER() function.
mysql-test/r/query_cache.result:
Let us test that queries with CURRENT_USER() function are not cached.
mysql-test/t/query_cache.test:
Let us test that queries with CURRENT_USER() function are not cached.
sql/item_create.cc:
create_func_current_user():
We should not cache queries which use CURRENT_USER() function.
fixing tests accordingly
item.cc:
Allow mixing non-binary collation and binary collation
even if coercibility is the same.
For easier 4.0 -> 4.1 migrating.
sql/item.cc:
Allow mixing non-binary collation and binary collation
even if coercibility is the same.
For easier 4.0 -> 4.1 migrating.
mysql-test/t/union.test:
fixing tests accordingly
mysql-test/r/union.result:
fixing tests accordingly
mysql-test/t/ctype_collate.test:
fixing tests accordingly
mysql-test/r/ctype_collate.result:
fixing tests accordingly
mysql-test/r/sp-error.result:
Added test case for BUG#9073.
mysql-test/t/sp-error.test:
Added test case for BUG#9073.
sql/share/errmsg.txt:
New error message for duplicate condition handlers in stored procedures.
sql/sp_pcontext.cc:
Keep track on condition handlers in the same block for error checking.
sql/sp_pcontext.h:
Keep track on condition handlers in the same block for error checking.
sql/sql_yacc.yy:
Keep track on condition handlers in the same block for error checking.
and BUG#9074: STORED PROC: The scope of every handler declared is not properly applied
mysql-test/r/sp.result:
New test cases for BUG#6900 and BUG#9074 (duplicates).
mysql-test/t/sp.test:
New test cases for BUG#6900 and BUG#9074 (duplicates).
sql/sp_rcontext.cc:
Corrected logic for finding condition handlers - pick the innermost one.
mysql-test/r/sp-error.result:
Added test case for BUG#7299.
mysql-test/t/sp-error.test:
Added test case for BUG#7299.
sql/sp_rcontext.cc:
Corrected cut&paste error; make sure we only catch actual errors with sqlexception.
Since 4.1 keys are compared with trailing spaces.
Thus, a "x " key can be inserted between a couple of "x" keys.
The existing code did not take this into account. Though the
comments in the code claimed it did.
myisam/mi_search.c:
Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
Fixed some function comments.
In the case when we insert a different key between two identical keys,
the difference must be additional spaces. In this case the prefix is
the same as that of the new key instead of the (zero) remaining length.
myisam/mi_write.c:
Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
Fixed a function comment.
mysql-test/r/myisam.result:
Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
The test result.
mysql-test/t/myisam.test:
Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
The test case.
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
BitKeeper/deleted/.del-errmsg.txt~b44a85a177954da0:
Auto merged
- Removed hardcoded error message from 4.1
include/my_base.h:
Adding error message for the case when table definition has changed in storage engine
mysql-test/t/ndb_alter_table.test:
Updated testresult to expect new error code
sql/ha_ndbcluster.cc:
Add mapping for ndb error 284 to HA_ERR_TABLE_DEF_CHANGED, this error will occur when the table definition has been changed by another MySQL Server connected to the cluster.
Remove hardcoded errormessage from 4.1
sql/handler.cc:
Adding error message for the case when table definition has changed in storage engine
sql/share/errmsg.txt:
Adding error message for the case when table definition has changed in storage engine
