MEMORY is alias for HEAP for CREATE TABLE ... TYPE=HEAP
Fixed bug in multi-table-update where a row could be updated several times
mysql-test/r/heap.result:
Test of CREATE TABLE ... type=MEMORY
mysql-test/r/innodb.result:
Added multi-update-test
mysql-test/r/multi_update.result:
Added multi-update-test
mysql-test/t/heap.test:
Test of CREATE TABLE ... type=MEMORY
mysql-test/t/innodb.test:
Added multi-update-test
mysql-test/t/multi_update.test:
Added multi-update-test
sql/ha_innodb.h:
Allow optimzation of multi-table-update also for InnoDB tables
sql/handler.h:
Allow optimzation of multi-update also for InnoDB tables
sql/key.cc:
After merge fix
sql/lex.h:
MEMORY is alias for HEAP
sql/sql_test.cc:
Fixed wrong printf
sql/sql_update.cc:
Fixed bug in multi-table-update where a row could be updated several times
sql/sql_yacc.yy:
MEMORY is alias for HEAP
a deadlock between I/O and SQL threads in replication
when relay_log_space is too small. This fixes bug #79.
sql/log.cc:
New variable rli->ignore_log_space_limit to resolve
a deadlock between I/O and SQL threads in replication
when relay_log_space is too small.
sql/slave.cc:
New variable rli->ignore_log_space_limit to resolve
a deadlock between I/O and SQL threads in replication
when relay_log_space is too small.
sql/slave.h:
New variable rli->ignore_log_space_limit to resolve
a deadlock between I/O and SQL threads in replication
when relay_log_space is too small.
sql/sql_repl.cc:
New variable rli->ignore_log_space_limit to resolve
a deadlock between I/O and SQL threads in replication
when relay_log_space is too small.
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.last
BitKeeper/etc/logging_ok:
auto-union
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-delete.result:
Auto merged
client/mysqlbinlog.cc:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/delete.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/delete.test:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_repl.h:
Auto merged
sql/sql_select.cc:
Auto merged
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-delete.result:
Delete: mysql-test/r/delete.result
BitKeeper/deleted/.del-stamp-h.in~4a5d6676232516c5:
Auto merged
client/mysqlbinlog.cc:
Auto merged
include/my_sys.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/delete.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
mysys/my_copy.c:
Auto merged
sql/field.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/mysql-test-run.sh:
merge with 3.23.56
mysql-test/r/backup.result:
merge (needs to be updated)
mysql-test/r/join.result:
merge (needs to be updated)
mysql-test/r/type_datetime.result:
merge (needs to be updated)
mysql-test/t/backup.test:
merge with 3.23
scripts/mysqld_safe.sh:
Only use first --user option
sql/ha_myisam.cc:
Don't let BACKUP TABLE overwrite old files
sql/log_event.h:
merge
sql/mysql_priv.h:
merge
sql/mysqld.cc:
Use first --user option
sql/slave.cc:
use local version
sql/sql_repl.h:
use local version
Fixed memory leak when replication restarts in debug mode
include/my_sys.h:
Added option to not overwrite files to my_copy()
mysql-test/mysql-test-run.sh:
Fixed --ddd option
Fixed that mysqld is restarted if there is a testname-master.sh file
mysql-test/r/backup.result:
Update for security fix in BACKUP TABLE
mysql-test/t/backup.test:
Update for security fix in BACKUP TABLE
mysys/my_copy.c:
Added option to not overwrite files to my_copy()
sql/ha_myisam.cc:
Don't allow BACKUP TABLE to overwrite files
sql/slave.cc:
Fixed problem with --debug output from 'handle_slave'
Fixed memory leak when replication restarts in debug mode
mysql-test/r/join.result:
Test of range optimizer bug
mysql-test/t/join.test:
Test of range optimizer bug
sql/sql_rename.cc:
Added missing DEBUG_PRINT()
Some after merge fixes
mysql-test/r/ctype_latin1_de.result:
Changed test to have more relevant results
mysql-test/r/delete.result:
Updated results after merge
mysql-test/r/select.result:
Remove explicit database usage
mysql-test/r/type_datetime.result:
Updated results after merge
mysql-test/t/ctype_latin1_de.test:
Changed test to have more relevant results
mysql-test/t/select.test:
Remove explicit database usage
sql/ha_myisam.cc:
Fixed AUTO_INCREMENT handling in MyISAM (last auto_increment patch broke things)
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-delete.result:
Delete: mysql-test/r/delete.result
client/mysqlbinlog.cc:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/delete.test:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
sql/field.h:
Auto merged
sql/lock.cc:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/type_datetime.result:
Update results after merge
sql/log_event.h:
Use local version
sql/mysql_priv.h:
Use local version
sql/mysqld.cc:
Use local version
sql/sql_repl.h:
Use local version
client/mysqltest.c:
Fixed bug that comments did a ping
include/thr_lock.h:
Added function to abort a lock for a specific thread
mysql-test/mysql-test-run.sh:
Fixed where mysqltest traces are put
mysql-test/r/lock_multi.result:
Test for LOCK TABLE + DROP TABLE bug
mysql-test/t/lock_multi.test:
Test for LOCK TABLE + DROP TABLE bug
mysys/thr_lock.c:
Added function to abort a lock for a specific thread
sql/handler.cc:
Indentation cleanup
sql/lock.cc:
Added function to abort a lock for a specific thread
sql/mysql_priv.h:
Added function to abort a lock for a specific thread
sql/mysqld.cc:
Use automatic recover even with --safe
+ fix for #70
+ test result fix for LOAD DATA LOCAL bug #82
client/mysqltest.c:
Removed wrong comment and useless sleep
mysql-test/mysql-test-run.sh:
Fix $slave_datadir variable because this
if [ -n "$1" ] ;
slave_datadir="var/$slave_ident-data/"
else
slave_datadir=$SLAVE_MYDDIR
was not coherent and led to problems of master.info not being deleted.
Delete relay-log.info too.
mysql-test/r/rpl000001.result:
SUM is 1022 (1021 was when we had the LOAD DATA LOCAL bug #82).
It's logical to have an even number as we load the same file twice.
sql/slave.cc:
When we RESET SLAVE, clear rli->master_log_* to give a good display in SHOW SLAVE STATUS ;
seeing the old values may confuse the user.
When we START SLAVE, clear rli->master_log_name, not only rli->master_log_pos.
sql/sql_repl.cc:
When we RESET SLAVE, clear mi->master_log_* to give a good display in SHOW SLAVE STATUS (bug #70)
mysql-test/r/rpl_loaddatalocal.result:
ChangeSet 1.1625 was faulty as regards this file (LOAD DATA LOCAL bug)
mysql-test/t/rpl_loaddatalocal.test:
ChangeSet 1.1625 was faulty as regards this file (LOAD DATA LOCAL bug)
sql/mf_iocache.cc:
ChangeSet 1.1625 was faulty as regards this file (LOAD DATA LOCAL bug)
regarded as unsigned longlongss, not as floats. This make these values work
similar to values between 10000000000000000000 and 18446744073709551615.
mysql-test/r/bigint.result:
Fixed results for bigints
mysql-test/t/bigint.test:
Fixed results for bigints
sql/item.h:
Mark unsigned big ints as unsigned
sql/sql_lex.cc:
Returns numbers between 9223372036854775807 and 9999999999999999999 as unsigned 64 bit numbers
Don't make OLD_PASSWORD() a reserved word
mysql-test/r/explain.result:
Test select count(*)
mysql-test/r/func_crypt.result:
Test old_password()
mysql-test/t/explain.test:
Test select count(*)
mysql-test/t/func_crypt.test:
Test old_password()
sql/item_create.cc:
Don't make OLD_PASSWORD() a reserved word
sql/item_create.h:
Don't make OLD_PASSWORD() a reserved word
sql/lex.h:
Don't make OLD_PASSWORD() a reserved word
sql/opt_range.cc:
Remove blank space
sql/opt_sum.cc:
Fix problem in MIN/MAX optimisation
mysql-test/r/type_datetime.result:
result for datetime fix
mysql-test/t/type_datetime.test:
test for datetime fix
sql/sql_select.cc:
Fix for a bug caused implicitely by MySQL having to comply with
ODBC standard on datetime comparisons.
This failed to update used_tables() for OR condition, which is why
query returned all rows on query as in .test above, while
none of types contains NULL nor 0 datetime (last one from ODBC)
Added ALL as parameter option for all group functions.
Make join handling uniform. This allows us to use ',', JOIN and INNER JOIN the same way.
Sort NULL last if DESC is used (ANSI SQL 99 requirement)
include/my_global.h:
Moved LL from mysql_priv (as this is also in config-win.h)
mysql-test/r/distinct.result:
Updated results
mysql-test/r/func_group.result:
Updated results
mysql-test/r/innodb.result:
Updated results
mysql-test/r/join.result:
Updated results
mysql-test/r/order_by.result:
Updated results
mysql-test/t/func_group.test:
Added test for SUM(ALL ...)
mysql-test/t/innodb.test:
Added test for START TRANSACTION
mysql-test/t/join.test:
Test different join syntaxes
mysql-test/t/order_by.test:
Added new test of NULL ordering.
sql/filesort.cc:
Sort NULL last if DESC is used
sql/lex.h:
Added OLD_PASSWORD() as synonym for PASSWORD.
sql/mysql_priv.h:
Removed LL()
sql/opt_range.cc:
Sort NULL last if DESC is used
sql/opt_range.h:
Sort NULL last if DESC is used
sql/slave.cc:
Indentation changes
sql/sql_parse.cc:
After merge fix
sql/sql_select.cc:
Added comment
sql/sql_yacc.yy:
Added START TRANSACTION syntax
Added ALL as parameter option for all group functions.
Make join handling uniform.
