Second version after review. Allow 'set autocommit' in procedures, but not
functions or triggers. Can return error in run-time (when a function calls
a procedure).
mysql-test/r/sp-error.result:
New test case for BUG#12712.
mysql-test/t/sp-error.test:
New test case for BUG#12712.
sql/set_var.cc:
Made sys_autocommit external, to allow testing in sql_yacc.yy.
sql/set_var.h:
Made sys_autocommit external, to allow testing in sql_yacc.yy.
sql/share/errmsg.txt:
New error message for disallowing the setting of autocommit in stored functions and triggers.
sql/sp_head.h:
New flag: has 'set autocommit', and testing for this in is_not_allowed_in_function().
sql/sql_yacc.yy:
Disallow setting AUTOCOMMIT in stored function and triggers.
get strange result
according to Monty's suggestions, fixing the SELECT behaviour on errors
with SP handlers. Note that some warnings from SELECT still shows up when
the handler has caught - this is an effect of another known bug (BUG#7049).
mysql-test/r/sp.result:
New test cases for BUG#12379.
mysql-test/t/sp.test:
New test cases for BUG#12379.
sql/sql_class.cc:
Abort selects on errors more graceful with SP handlers.
sql/sql_class.h:
Abort selects on errors more graceful with SP handlers.
into neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new
mysql-test/r/view.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
Solution for 5.0.
Changed calls to open_table(). Requested to ignore
flush at places where the command did already lock tables.
This could happen in CREATE ... SELECT and ALTER TABLE.
No test case. The bug can only be triggered by true concurrency.
The stress test suite provides a test case for this.
sql/sql_base.cc:
Bug#12845 - Stress test: Server crashes on CREATE .. SELECT statement
Solution for 5.0.
Changed open_table() so that ignoring flush requests
is dependend on the 'flags' parameter as ignoring drop
request was already. This aims for consistent behaviour.
sql/sql_table.cc:
Bug#12845 - Stress test: Server crashes on CREATE .. SELECT statement
Solution for 5.0.
Changed calls to open_table(). Requested to ignore
flush at places where the command did already lock tables.
This could happen in CREATE ... SELECT and ALTER TABLE.
Information_schema DB
Bug#9846 Inappropriate error displayed while
dropping table from 'INFORMATION_SCHEMA'
Bug#10734 Grant of privileges other than 'select' and
'create view' should fail on schema
Bug#10708 SP's can use INFORMATION_SCHEMA as ROUTINE_SCHEMA
cumulative fix for bugs above(after review, 2nd version)
added privilege check for information schema db & tables
Have to init. all local variables in their frames, not just once at the beginning
of invocation.
mysql-test/r/sp.result:
New test case for BUG#13133.
mysql-test/t/sp.test:
New test case for BUG#13133.
sql/sp_head.cc:
Just init. local variable slots in the fram to NULL. (Real init. will be done
in each block.)
sql/sp_pcontext.cc:
Removed isset flag, since it's not used.
sql/sp_pcontext.h:
Removed isset flag, since it's not used.
sql/sql_yacc.yy:
Initialize local variables in the block to null, or the default value, given.
(Untabifed block too.)
- Update test results
- Updates after review
mysql-test/r/func_in.result:
Update test results
mysql-test/r/lowercase_view.result:
Update test results
mysql-test/r/mysqldump.result:
Update test results
mysql-test/r/sql_mode.result:
Update test results
mysql-test/r/temp_table.result:
Update test results
mysql-test/r/view.result:
Update test results
mysql-test/t/mysqldump.test:
Update test results
sql/sql_show.cc:
Updated after review
(per Monty's patch).
Remove references to the "COMMENT" field.
WL#2414
mysql-test/r/federated.result:
alter from "COMMENT=" to "CONNECTION="
mysql-test/r/federated_archive.result:
change "COMMENT=" to "CONNECTION="
mysql-test/t/federated.test:
change from "COMMENT=" to "CONNECTION="
mysql-test/t/federated_archive.test:
change from "COMMENT=" to "CONNECTION="
sql/ha_federated.cc:
Change parsing of char* table->s->comment to LEX_STRING table->s->connect_string
(per Monty's patch)
sql/handler.h:
added LEX_STRING "connection_string"
(per Monty's patch)
sql/sql_yacc.yy:
added setting of "connect_string" string and length
sql/table.cc:
Modifying frm file to store connecting information (code change came from Monty).
sql/table.h:
added connect_string
sql/unireg.cc:
Storing information on connection_string (code came from Monty).
into mysql.com:/home/jimw/my/mysql-5.0-clean
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/violite.h:
Auto merged
mysql-test/r/ndb_autodiscover.result:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/ndbapi/SignalSender.cpp:
Auto merged
sql-common/client.c:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/net_serv.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viosocket.c:
Auto merged
vio/viossl.c:
Auto merged
configure.in:
Resolve conflicts
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
mysql-test/r/temp_table.result:
Auto merged
mysql-test/r/warnings.result:
Auto merged
sql/sql_db.cc:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/filesort.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/create.result:
Merged from 4.1 to 5.0
mysql-test/r/innodb.result:
Merged from 4.1 to 5.0
mysql-test/t/create.test:
Merged from 4.1 to 5.0
sql/item_cmpfunc.cc:
Merged from 4.1 to 5.0
sql/sql_table.cc:
Merged from 4.1 to 5.0
Fix for bug #13025; Server crash in filesort because wrong call to handler::position()
client/mysqltest.c:
Code cleanup during review
mysql-test/r/innodb.result:
Added test case for bug #13025; Server crash in filesort because wrong call to handler::position()
mysql-test/t/innodb.test:
Added test case for bug #13025; Server crash in filesort because wrong call to handler::position()
sql/filesort.cc:
Don't call handler::position() if row was not found
sql/item_cmpfunc.cc:
Indentation changes
sql/sql_select.cc:
Moved variable to outer level
The problem was in that add_table_to_list was testing for duplicate tables
in a list of tables that included the created view.
mysql-test/r/view.result:
Test for BUG#6808
mysql-test/t/view.test:
Test for BUG#6808
sql/sql_parse.cc:
When testing for table name uniquness, skip the first table the current
statement is CREATE VIEW. Notice that the first table is skipped differently
for CREATE TABLE ... SELECT ... statements, so we don't have to handle that
case here (see production 'create_select', the call 'to save_and_clear').
produce warning for 'create database if not exists' if database exists
do not update database options in this case
produce warning for 'create table if not exists' if table exists
mysql-test/r/create.result:
Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
updated test case result
mysql-test/r/temp_table.result:
Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
updated test case result
mysql-test/r/warnings.result:
Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
updated test case result
mysql-test/t/create.test:
Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
test case
sql/sql_db.cc:
Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
produce warning for 'create database if not exists' if database exists
do not update database options in this case
sql/sql_table.cc:
Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
produce warning for 'create table if not exists' if table exists
mysql-test/r/select.result:
Test for BUG#13067
mysql-test/t/select.test:
Test for BUG#13067
sql/sql_base.cc:
Correctly compare field names with respect to case sensitivity.
When view column aliased in subselect alias is set on ref which represents
field. When tmp table is created for subselect, it takes name of original field
not ref. Because of this alias on view column in subselect is lost. Which
results in reported error.
Now when alias is set on ref, it's set on ref real item too.
mysql-test/r/view.result:
Test case for bug #12993 View column rename broken in subselect
mysql-test/t/view.test:
Test case for bug #12993 View column rename broken in subselect
sql/sql_base.cc:
Fix bug #12993 View column rename broken in subselect
Now when alias is set on ref, it's set on ref real item too.
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
mysql-test/t/analyse.test:
Auto merged
sql/sql_analyse.cc:
Auto merged
mysql-test/r/analyse.result:
Merge from 4.1
into mysql.com:/users/lthalmann/bk/mysql-5.0
mysql-test/r/insert_select.result:
Auto merged
mysql-test/t/insert_select.test:
Auto merged
sql/sql_parse.cc:
Manual marge
The problem was that in the first production in rule 'join_table', that
processes simple cross joins, the parser was processing the second join operand
before the first one due to unspecified priorities of JOINs. As a result in the
case of cross joins the parser constructed a tree with incorrect nesting:
the expression "t1 join t2 join t3 on some_cond" was interpreted as
"t1 join (t2 join t3 on some_cond)" instead of
"(t1 join t2) join t3 on some_cond".
Because of this incorrect nesting the method make_join_on_context picked an
incorrect table as the first table of the name resolution context.
The solution assignes correct priorities to the related production.
mysql-test/r/select.result:
Added test for BUG#12943.
mysql-test/t/select.test:
Added test for BUG#12943.
sql/sql_parse.cc:
Fixed typo.
sql/sql_yacc.yy:
Provide explicit priorities of the JOIN operator and the 'table_ref' rule,
to enforce left-associativity of [INNER | CROSS] JOIN.
