mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_view.cc:
Auto merged
Fixed (together with Guilhem) bugs in mysqlbinlog regarding --offset
Prefix addresses with 0x for easier comparisons of debug logs
Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index
This fix changed some 'index' queries to 'range' queries in the test suite
Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause.
This fix removed of a lot of 'Using where' notes in the test suite.
Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS
Give NOTE instead of WARNING for safe field-type conversions
Makefile.am:
Don't automaticly update files from bk
client/mysqlbinlog.cc:
Merge with 4.1 (+ apply bug fixes for --offset and --start-position)
include/my_sys.h:
Faster clear_alloc_root()
mysql-test/r/bdb.result:
Updated results after merge
mysql-test/r/create.result:
Updated results after merge
mysql-test/r/func_group.result:
Updated results after merge
mysql-test/r/func_if.result:
Updated results after merge
mysql-test/r/heap_btree.result:
Updated results after merge
mysql-test/r/index_merge.result:
Updated results after merge
mysql-test/r/index_merge_ror.result:
Updated results after merge
mysql-test/r/innodb.result:
Updated results after merge
mysql-test/r/join_outer.result:
Updated results after merge
mysql-test/r/mysqlbinlog2.result:
Updated results after merge
mysql-test/r/negation_elimination.result:
Updated results after merge
mysql-test/r/null.result:
Updated results after merge
Added more tests
mysql-test/r/null_key.result:
Updated results after merge
Added more tests
mysql-test/r/order_by.result:
Updated results after merge
mysql-test/r/range.result:
Updated results after merge
Added more tests
mysql-test/r/rpl_charset.result:
Updated results after merge
mysql-test/r/sp-error.result:
Updated results after merge
mysql-test/r/sp.result:
Updated results after merge
Added delete of some stored procedures in an attempt to be able to re-run test even if it aborts in the middle
mysql-test/r/type_blob.result:
Updated results after merge
(Some warnings are now notes)
mysql-test/r/user_var.result:
Updated results after merge
Added more tests
mysql-test/r/variables.result:
Updated results after merge
mysql-test/r/view.result:
Updated results after merge
mysql-test/t/mysqlbinlog2.test:
Updated tests to use new positions
mysql-test/t/null.test:
More tests
mysql-test/t/null_key.test:
More tests
mysql-test/t/range.test:
More tests
mysql-test/t/rpl_charset.test:
Avoid big diffs in the future if tests changes
mysql-test/t/sp-error.test:
Updated error numbers
mysql-test/t/sp-security.test:
Updated error numbers
mysql-test/t/sp.test:
Updated results after merge
Added delete of some stored procedures in an attempt to be able to re-run test even if it aborts in the middle
mysql-test/t/user_var.test:
More tests
mysql-test/t/view.test:
Updated error numbers
mysys/my_alloc.c:
Write into debug log the address of the allocated area
sql/ha_isam.cc:
Prefix addresses with 0x for easier comparisons of debug logs
sql/ha_myisam.cc:
Prefix addresses with 0x for easier comparisons of debug logs
sql/ha_ndbcluster.cc:
Add missing enum to switch
sql/handler.cc:
remove compiler warning
sql/item.cc:
More debugging
Simple cleanup
sql/item.h:
Move Item::cleanup() to item.cc
sql/item_cmpfunc.cc:
Fix arena code
sql/item_subselect.cc:
After merge fixes
sql/item_subselect.h:
After merge fixes
sql/item_sum.cc:
Updated comment
sql/log_event.cc:
Remove wrong test
sql/mysql_priv.h:
Indentation fixes
sql/mysqld.cc:
After merge fixes
Added 0x to pointers in debug log
sql/opt_range.cc:
Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index
This fix changed some 'index' queries to 'range' queries in the test suite
sql/set_var.cc:
Indentation fixes
sql/sp_head.cc:
Set state to INITIALIZED to make SP work with new arena code
sql/sql_base.cc:
After merge fixes
sql/sql_class.cc:
More debugging
Use clear_alloc_root() instead of init_alloc_root() as the former is faster
sql/sql_class.h:
New method 'only_prepare()'
sql/sql_lex.cc:
After merge fixes
sql/sql_lex.h:
After merge fixes
sql/sql_parse.cc:
Fix for timezone tables. (The old way to add timezone tables to global list in 'create_total_list' doesn't work anymore)
Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS
sql/sql_prepare.cc:
After merge fixes
sql/sql_select.cc:
Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause.
This fix removed of a lot of 'Using where' notes in the test suite
sql/sql_table.cc:
Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS
sql/sql_union.cc:
After merge fix
sql/sql_view.cc:
After merge fix
sql/table.cc:
After merge fix
sql/tztime.cc:
Update timezone table handling to use new table lists structure
sql/tztime.h:
Update timezone table handling to use new table lists structure
sql/unireg.cc:
Use 0x before pointers
mysql-test/r/lowercase_view.result:
test of updating and fetching from the same table check
mysql-test/r/view.result:
test of updating and fetching from the same table check
mysql-test/t/lowercase_view.test:
test of updating and fetching from the same table check
mysql-test/t/view.test:
test of updating and fetching from the same table check
sql/mysql_priv.h:
unique table test
sql/sql_base.cc:
unique table test which take into account views added
sql/sql_delete.cc:
unique table test which take into account views added
sql/sql_insert.cc:
unique table test which take into account views added
sql/sql_parse.cc:
unique table test which take into account views added
sql/sql_update.cc:
unique table test which take into account views added
sql/sql_view.cc:
unique table test which take into account views added
sql/table.h:
save next independent (do not belong to current view) table
mysql-test/r/view.result:
INSERT into VIEW with ON DUPLICATE
mysql-test/t/view.test:
INSERT into VIEW with ON DUPLICATE
sql/sql_insert.cc:
do not use Item_ref for view fields if it is UPDATE of INSERT
include/mysqld_error.h:
bug name and number of bugs fixed
mysql-test/r/view.result:
VIEW over SELECT with prohibited clauses
mysql-test/t/view.test:
VIEW over SELECT with prohibited clauses
sql/share/czech/errmsg.txt:
error message made more general
sql/share/danish/errmsg.txt:
error message made more general
sql/share/dutch/errmsg.txt:
error message made more general
sql/share/english/errmsg.txt:
error message made more general
sql/share/estonian/errmsg.txt:
error message made more general
sql/share/french/errmsg.txt:
error message made more general
sql/share/german/errmsg.txt:
error message made more general
sql/share/greek/errmsg.txt:
error message made more general
sql/share/hungarian/errmsg.txt:
error message made more general
sql/share/italian/errmsg.txt:
error message made more general
sql/share/japanese/errmsg.txt:
error message made more general
sql/share/korean/errmsg.txt:
error message made more general
sql/share/norwegian-ny/errmsg.txt:
error message made more general
sql/share/norwegian/errmsg.txt:
error message made more general
sql/share/polish/errmsg.txt:
error message made more general
sql/share/portuguese/errmsg.txt:
error message made more general
sql/share/romanian/errmsg.txt:
error message made more general
sql/share/russian/errmsg.txt:
error message made more general
sql/share/serbian/errmsg.txt:
error message made more general
sql/share/slovak/errmsg.txt:
error message made more general
sql/share/spanish/errmsg.txt:
error message made more general
sql/share/swedish/errmsg.txt:
error message made more general
sql/share/ukrainian/errmsg.txt:
error message made more general
sql/sql_view.cc:
checked INTO clause during view creation
mysql-test/r/view.result:
problem with used_tables() of outer reference resolved in VIEW
mysql-test/t/view.test:
problem with used_tables() of outer reference resolved in VIEW
sql/item.cc:
fixed staistic of subquery if outer field resolved in merged view
mysql-test/r/view.result:
VIEWs with national characters
mysql-test/t/view.test:
VIEWs with national characters
sql/sql_view.cc:
system charset (with wich VIEW printed) saved in .frm and restored before parsing view
sql/table.h:
system charset (with wich VIEW printed) saved in .frm
mysql-test/r/view.result:
VIEW with floating point (long bumber) as column
mysql-test/t/view.test:
VIEW with floating point (long bumber) as column
sql/item.cc:
fixed printing of real constants
sql/item.h:
fixed printing of real constants
mysql-test/r/view.result:
fixed test
VIEW over droped function
mysql-test/t/view.test:
VIEW over droped function
sql/item_func.cc:
after review fix
sql/sp.cc:
hint to find mysql.proc
sql/sql_lex.h:
hint to find mysql.proc
sql/sql_parse.cc:
hint to find mysql.proc
sql/sql_view.cc:
adding mysql.proc to table list if view contains stored procedures
mysql-test/r/subselect.result:
ORDER clause printing fixed
mysql-test/r/view.result:
order by refers on integer field
mysql-test/t/view.test:
order by refers on integer field
sql/sql_lex.cc:
ORDER clause printing fixed
sql/sql_parse.cc:
fields for correct ORDER printing added
sql/sql_select.cc:
fields for correct ORDER printing added
sql/table.h:
fields for correct ORDER printing added
mysql-test/r/view.result:
tested problem when function name length close to ALIGN_SIZE
mysql-test/t/view.test:
tested problem when function name length close to ALIGN_SIZE
sql/item_func.cc:
fixed case when real length very close to calculated (less then ALIGN)
mysql-test/r/view.result:
VIEW based on functions with complex names
mysql-test/t/view.test:
VIEW based on functions with complex names
sql/item_func.cc:
fixed printing of stored procedure functions names
mysql-test/r/view.result:
VIEW of VIEW with column renaming
mysql-test/t/view.test:
VIEW of VIEW with column renaming
sql/mysql_priv.h:
Item name for VIEW added to find_field_in_table
sql/sql_acl.cc:
new parameter
sql/sql_base.cc:
Item name for VIEW added to find_field_in_table
fixed other Item_ref methods where result_field involved
mysql-test/r/view.result:
statements added to distinct in temporary table with a VIEW test
test of agggregate over aggregate with view
mysql-test/t/view.test:
statements added to distinct in temporary table with a VIEW test
test of agggregate over aggregate with view
sql/item.cc:
fixed other Item_ref methods where result_field involved
sql/item.h:
fixed other Item_ref methods where result_field involved
sql/sql_lex.cc:
fixed updateability VIEW detection
mysql-test/r/view.result:
distinct in temporary table with a VIEW
mysql-test/t/view.test:
distinct in temporary table with a VIEW
sql/item.cc:
fix of Item_ref with result_field
sql/item.h:
fix of Item_ref with result_field
mysql-test/r/view.result:
SHOW CREATE VIEW output changed
test of SHOW CREATE VIEW for view with spaces in the name
mysql-test/t/view.test:
test of SHOW CREATE VIEW for view with spaces in the name
sql/sql_show.cc:
fixes name outout for SHOW CREATE VIEW command
mysql-test/r/view.result:
Showing VIEW with VIEWs in subquery
mysql-test/t/view.test:
Showing VIEW with VIEWs in subquery
sql/sql_lex.cc:
new method to detect commands where all VIEWs should be temporary tables
sql/sql_lex.h:
new method to detect commands where all VIEWs should be temporary tables
sql/sql_view.cc:
new method to detect commands where all VIEWs should be temporary tables
debug output added
mysql-test/r/view.result:
Aggregate functions in view list
mysql-test/t/view.test:
Aggregate functions in view list
sql/table.cc:
fixed aggregate function processing in VIEWs
mysql-test/r/view.result:
added removing of table t2
test of view built over union
mysql-test/t/view.test:
added removing of table t2
test of view built over union
sql/sql_view.cc:
Fixed UNION support in view creation
mysql-test/r/view.result:
test of functions in VIEW which is converted to constants internally
mysql-test/t/view.test:
test of functions in VIEW which is converted to constants internally
sql/item.h:
items for functions which is converted to constants internally to support its correct printing
sql/item_create.cc:
items for functions which is converted to constants internally to support its correct printing
mysql-test/r/view.result:
using VIEW where table is required
mysql-test/t/view.test:
using VIEW where table is required
sql/sql_base.cc:
sending right error message where VIEW is not expected
sql/sql_view.h:
frm_type_enum moved to table.h becuae used in TABLE_LIST
sql/table.h:
frm_type_enum moved to table.h becuae used in TABLE_LIST
mysql-test/r/view.result:
EXISTS with UNION VIEW creation test
mysql-test/t/view.test:
EXISTS with UNION VIEW creation test
sql/sql_lex.cc:
fixed LIMIT clause printing
mysql-test/r/view.result:
test of error processing found in preparation phase
mysql-test/t/view.test:
test of error processing found in preparation phase
sql/sql_view.cc:
fixed error processing of prepare
mysql-test/r/view.result:
Test of view updatebility in prepared statement
mysql-test/t/view.test:
Test of view updatebility in prepared statement
sql/sql_prepare.cc:
resolve UPDATE fields belonged to VIEWs as Item_field (instead of Item_ref) in prepared statements, too
mysql-test/r/view.result:
using VIEW fields several times in query resolved via temporary tables
mysql-test/t/view.test:
using VIEW fields several times in query resolved via temporary tables
sql/item.h:
fixed using of result_field by Item_ref
sql/sql_base.cc:
Create Item_ref as reference on VIEW fields expression reference
sql/sql_insert.cc:
privent creating Item_ref in insert list (where Item_fields should be)
sql/sql_lex.cc:
Item_ref creation control
sql/sql_lex.h:
Item_ref creation control
sql/sql_update.cc:
privent creating Item_ref in insert list (where Item_fields should be) and creation Item_fields for UPDATE list
sql/table.cc:
Do not create Item_ref for internal view of view processing
mysql-test/r/view.result:
fixed ps variavles test
test of view built over updatable view
mysql-test/t/view.test:
fixed ps variavles test
test of view built over updatable view
sql/sql_acl.cc:
mpre optimal locking (found by Monty)
sql/sql_view.cc:
made different fields for view updatebility in principle and updatability during this execution
sql/table.h:
made different fields for view updatebility in principle and updatability during this execution
mysql-test/r/view.result:
check 'use index' on view with temporary table
mysql-test/t/view.test:
check 'use index' on view with temporary table
sql/sql_base.cc:
privent crash on temporary table
mysql-test/r/view.result:
test of duplicate field names
mysql-test/t/view.test:
test of duplicate field names
sql/sql_view.cc:
test of duplicate field names
error handling of view initialization fixed (Bug#4599)
include/mysqld_error.h:
new error message
mysql-test/r/view.result:
changing of underlaying table test
mysql-test/t/view.test:
changing of underlaying table test
sql/share/czech/errmsg.txt:
new error message
sql/share/danish/errmsg.txt:
new error message
sql/share/dutch/errmsg.txt:
new error message
sql/share/english/errmsg.txt:
new error message
sql/share/estonian/errmsg.txt:
new error message
sql/share/french/errmsg.txt:
new error message
sql/share/german/errmsg.txt:
new error message
sql/share/greek/errmsg.txt:
new error message
sql/share/hungarian/errmsg.txt:
new error message
sql/share/italian/errmsg.txt:
new error message
sql/share/japanese/errmsg.txt:
new error message
sql/share/korean/errmsg.txt:
new error message
sql/share/norwegian-ny/errmsg.txt:
new error message
sql/share/norwegian/errmsg.txt:
new error message
sql/share/polish/errmsg.txt:
new error message
sql/share/portuguese/errmsg.txt:
new error message
sql/share/romanian/errmsg.txt:
new error message
sql/share/russian/errmsg.txt:
new error message
sql/share/serbian/errmsg.txt:
new error message
sql/share/slovak/errmsg.txt:
new error message
sql/share/spanish/errmsg.txt:
new error message
sql/share/swedish/errmsg.txt:
new error message
sql/share/ukrainian/errmsg.txt:
new error message
sql/sql_base.cc:
error message interception
error handling fixed
sql/sql_view.cc:
comment fixed
error message interception
sql/table.cc:
error message interception
sql/table.h:
error message interception
mysql-test/r/view.result:
fixed quoting of identifiers in VIEWs
mysql-test/t/view.test:
fixed quoting of identifiers in VIEWs
sql/item.cc:
fixed quoting of identifiers in VIEWs
sql/sql_select.cc:
fixed quoting of identifiers in VIEWs
sql/sql_view.cc:
fixed quoting of identifiers in VIEWs
mysql-test/r/view.result:
test of VIEW without tables
mysql-test/t/view.test:
test of VIEW without tables
sql/sql_view.cc:
fix case what VIEW have not tables
mysql-test/r/bench_count_distinct.result:
Quoting of fields and tables names
mysql-test/r/case.result:
Quoting of fields and tables names
mysql-test/r/fulltext.result:
Quoting of fields and tables names
mysql-test/r/func_default.result:
Quoting of fields and tables names
mysql-test/r/func_gconcat.result:
Quoting of fields and tables names
mysql-test/r/func_group.result:
Quoting of fields and tables names
mysql-test/r/func_if.result:
Quoting of fields and tables names
mysql-test/r/func_in.result:
Quoting of fields and tables names
mysql-test/r/func_regexp.result:
Quoting of fields and tables names
mysql-test/r/func_test.result:
Quoting of fields and tables names
mysql-test/r/gis.result:
Quoting of fields and tables names
mysql-test/r/group_by.result:
Quoting of fields and tables names
mysql-test/r/having.result:
Quoting of fields and tables names
mysql-test/r/insert_update.result:
Quoting of fields and tables names
mysql-test/r/join_nested.result:
Quoting of fields and tables names
mysql-test/r/olap.result:
Quoting of fields and tables names
mysql-test/r/query_cache.result:
Quoting of fields and tables names
mysql-test/r/select.result:
Quoting of fields and tables names
mysql-test/r/subselect.result:
Quoting of fields and tables names
mysql-test/r/union.result:
Quoting of fields and tables names
mysql-test/r/varbinary.result:
Quoting of fields and tables names
mysql-test/r/view.result:
Quoting of fields and tables names
test of view with quated fields
mysql-test/t/view.test:
test of view with quated fields
sql/item.cc:
Quoting of fields and tables names
sql/item.h:
Quoting of fields and tables names
sql/sql_select.cc:
Quoting of fields and tables names
sql/sql_view.cc:
mark subquery in the FROM clause like derived
mysql-test/r/view.result:
test made more environment independed
mysql-test/t/view.test:
test made more environment independed
sql/sql_acl.cc:
fixed case when frivileges check switched off
