spaces at line end in fresh definitions removed
fixed printing of nested joins (BUG#4352)
mysql-test/r/join_nested.result:
fixed join_nested test independence of environment
print of nested join test added
mysql-test/t/join_nested.test:
fixed join_nested test independence of environment
print of nested join test added
sql/sql_lex.h:
space at line end in fresh definition removed
sql/sql_select.cc:
fixed printing of nested joins
sql/table.h:
spaces at line end in fresh definitions removed
method for table printing
processlist on slave":
we now report in SHOW PROCESSLIST that we are writing to the temp
files or loading the table. When we are writing to the tmp file:
| 3 | system user | | | Connect | 6 | Making temp file /tmp/SQL_LOAD-2-1-2.data |
and when we are actually loading the .data temp file into the table:
| 3 | system user | | test | Connect | 2 | | LOAD DATA INFILE '/tmp/SQL_LOAD-2-1-2.data' INTO TABLE `t` <...> |
sql/log_event.cc:
Replication of LOAD DATA INFILE:
we now report in SHOW PROCESSLIST that we are creating
the temp files or loading the table.
Plus removing a line which had a comment "should not be needed"
and a guarding assertion which we have never heard fail (and logic
says it should not fail).
Post-merge fixes for nested joins.
The join_tab_cmp function in sql_select has been changed.
join_nested.result:
Post-merge fixes for nested joins.
The join_tab_cmp function in sql_select has been changed
sql_select.cc:
Post-merge fixes for nested joins.
Avoided re-execution of eliminate_not_funcs and simplify_joins
in optimize_cond.
Changed the join_tab_cmp function to take into account
the dependent relation.
sql_lex.cc, sql_lex.h:
Added the first_cond_optimization flag to st_select_lex to avoid
re-execution of some optimizations in optimize_cond.
sql_base.cc:
Post-merge fixes for nested joins.
Fixed problems with a proper column list substituted for '*' in
queries with natural joins.
sql/sql_base.cc:
Post-merge fixes for nested joins.
Fixed problems with a proper column list substituted for '*' in
queries with natural joins.
sql/sql_lex.h:
Added the first_cond_optimization flag to st_select_lex to avoid
re-execution of some optimizations in optimize_cond.
sql/sql_lex.cc:
Added the first_cond_optimization flag to st_select_lex to avoid
re-execution of some optimizations in optimize_cond.
sql/sql_select.cc:
Post-merge fixes for nested joins.
Avoided re-execution of eliminate_not_funcs and simplify_joins
in optimize_cond.
Changed the join_tab_cmp function to take into account
the dependent relation.
mysql-test/r/join_nested.result:
Post-merge fixes for nested joins.
The join_tab_cmp function in sql_select has been changed
mysql-test/r/select.result:
Post-merge fixes for nested joins.
The join_tab_cmp function in sql_select has been changed.
mysql-test/r/subselect2.result:
Post-merge fixes for nested joins.
The join_tab_cmp function in sql_select has been changed.
Moved include <assert.h> to my_global.h
VC++Files/client/mysqlclient.dsp:
Added missing my_time.c file to mysqlclient project
include/my_dbug.h:
Moved include <assert.h> to my_global.h
Removed NDEBUG as asserts should be indenpendent of if we are using DBUG or not
include/my_global.h:
Added assert.h as this is included in a lot of places
sql/sql_table.cc:
Initialize forgotten variable
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1-ndb
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
(table opened in my_tz_init, was removed from thd->open_tables in
tz_load_from_db w/o being unlocked, so it was stayng in open_cache
forever preventing the latter from being free'd in table_cache_free)
mysql-test/r/func_group.result:
fixed
mysql-test/r/ps.result:
SHOW TABLE STATUS test
mysql-test/t/ps.test:
SHOW TABLE STATUS test
sql/sql_parse.cc:
Use lex->describe instead of lex->select_lex.options
sql/sql_yacc.yy:
removed unneed initialization of lex->select_lex.options
mysql-test/r/flush_table.result:
after merge fixed
duplicated tests removed
mysql-test/t/flush_table.test:
after merge fixed
duplicated tests removed
sql/sql_yacc.yy:
alias is not db-qualified
include/mysql.h:
Cleanup
sql-common/client.c:
Allow client.c to compile after changes to mysql.h
sql/opt_range.cc:
Make bdb.test repeatable (and assume that table scans is a little bit slower)
sql/sql_handler.cc:
Fixed typo during merge
sql/sql_insert.cc:
Fixed indentation
BitKeeper/etc/ignore:
added sql/mysql_tzinfo_to_sql
BitKeeper/etc/logging_ok:
auto-union
acinclude.m4:
Auto merged
extra/perror.c:
Auto merged
include/mysql.h:
Auto merged
innobase/include/mach0data.ic:
Auto merged
innobase/include/mtr0log.h:
Auto merged
innobase/include/mtr0log.ic:
Auto merged
innobase/mem/mem0dbg.c:
Auto merged
innobase/pars/lexyy.c:
Auto merged
BitKeeper/deleted/.del-4.0.XX-gpl.ipr~f5909a9e9bd8094:
Auto merged
BitKeeper/deleted/.del-Clients and Tools.fgl~bf0f776883577f02:
Auto merged
BitKeeper/deleted/.del-Development.fgl~6392ce285e73f5fc:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/innodb_cache.result:
Auto merged
mysql-test/r/lowercase_table2.result:
Auto merged
mysql-test/t/innodb_cache.test:
Auto merged
mysql-test/t/lowercase_table2.test:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/handler.cc:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
libmysql/libmysql.c:
Merge with 4.0
mysql-test/r/bdb.result:
Merge with 4.0
mysql-test/r/range.result:
Merge with 4.0
mysql-test/t/bdb.test:
Merge with 4.0
mysys/hash.c:
Merge with 4.0
scripts/mysql_install_db.sh:
Merge with 4.0
sql/field.cc:
Merge with 4.0
sql/field.h:
Merge with 4.0
sql/mysql_priv.h:
Merge with 4.0
sql/sql_handler.cc:
Merge with 4.0
sql/sql_select.cc:
Merge with 4.0
sql/sql_table.cc:
Merge with 4.0
problems with unresolved dependancies on some platforms.
sql/mysql_priv.h:
Moved my_time_t definitions to tztime.h to avoid mysql_tzinfo_to_sql dependancy
on mysql_priv.h.
sql/tztime.cc:
Removed mysql_tzinfo_to_sql dependancy from mysql_priv.h
sql/tztime.h:
Moved my_time_t definitions to tztime.h to avoid mysql_tzinfo_to_sql dependancy
on mysql_priv.h.
Set default max_allowed_packet to be able to read help tables even if an my.cnf file with this option is present. (Bug #3938)
Don't use default arguments for ha_rnd_init()
Simple code cleanups since last pull
scripts/fill_func_tables.sh:
Change mode to -rw-rw-r--
scripts/make_win_src_distribution.sh:
Safer remove of SCCS directories
scripts/mysql_create_system_tables.sh:
Added missing root user to mysql.user on windows. (Bug #4242)
scripts/mysql_install_db.sh:
Set default max_allowed_packet to be able to read help tables even if an my.cnf file with this option is present. (Bug #3938)
sql/filesort.cc:
Don't use default arguments for ha_rnd_init()
sql/ha_berkeley.cc:
Better to use #ifdef than // to disable code
Removed not needed setting of active_index (It's set in index_end)
sql/ha_berkeley.h:
Don't use default arguments for ha_rnd_init()
sql/ha_heap.h:
Don't use default arguments for ha_rnd_init()
sql/ha_innodb.h:
Don't use default arguments for ha_rnd_init()
sql/ha_isam.h:
Don't use default arguments for ha_rnd_init()
sql/ha_isammrg.h:
Don't use default arguments for ha_rnd_init()
sql/ha_myisam.cc:
Fixed wrong previous patch (New code used 'and' between two conditions when it should be 'or' as in original code)
sql/ha_myisam.h:
Don't use default arguments for ha_rnd_init()
sql/ha_myisammrg.h:
Don't use default arguments for ha_rnd_init()
sql/ha_ndbcluster.h:
Don't use default arguments for ha_rnd_init()
sql/handler.cc:
Code cleanup
sql/handler.h:
Keep bool variables together (better alignment)
sql/records.cc:
Don't use default arguments for ha_rnd_init()
sql/sql_select.cc:
Don't use default arguments for ha_rnd_init()
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/select.result:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.h:
Auto merged
mysql-test/r/ps.result:
parameters from variables (for field creation)
mysql-test/t/ps.test:
parameters from variables (for field creation)
sql/item.cc:
type of parameter assignment for parameters from variables
sql/item.h:
removed spaces at line ends in Item_param definition
compile even without InnoDB
mysql-test/t/system_mysql_db_fix.test:
remove ^M's
mysql-test/t/system_mysql_db_refs.test:
remove ^M's
sql/mysqld.cc:
compile even without InnoDB !
mysql-test/r/ps.result:
test of prepared EXPLAIN
mysql-test/t/ps.test:
fix layout and table removing of previous tests
test of prepared EXPLAIN
sql/sql_prepare.cc:
explain pave to be prepared, too
cleanup options after explain execution
sql/sql_select.cc:
removed unneed assignment
