| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| | |
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/handler.cc:
Auto merged
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
table that was locked bug not droped
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
BitKeeper/deleted/.del-mwenv~35c8b56062f4b6aa:
Delete: netware/mw/mwenv
BitKeeper/deleted/.del-mwasmnlm~bc5746809d67feb5:
Delete: netware/mw/mwasmnlm
BitKeeper/deleted/.del-mwccnlm~be63afd25a14c3f:
Delete: netware/mw/mwccnlm
BitKeeper/deleted/.del-mwldnlm~efb26c57cba3c980:
Delete: netware/mw/mwldnlm
|
| |
| |
| |
| |
| | |
netware/mysql_fix_privilege_tables.pl:
Import patch novell40b.patch
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
into mysql.com:/space/my/mysql-4.0
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
packaging
- enclosed some variables in quotes for safeguarding
- add a license file (GPL or MySQLEULA) to the package so it will be
displayed during installation (needs to be tested)
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time
sql/sql_class.cc:
Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time
sql/handler.cc:
Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time
sql/handler.h:
Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time
sql/ha_innodb.cc:
Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time
sql/ha_innodb.h:
Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Print a more precise error message if log files or data files are of a size different from what is specified in my.cnf
innobase/srv/srv0start.c:
Print a more precise error message if log files or data files are of a size different from what is specified in my.cnf
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
(more reinitializations)
+ 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)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Print trx rollback progress info in crash recovery
innobase/include/srv0start.h:
Print trx rollback progress info in crash recovery
innobase/trx/trx0roll.c:
Print trx rollback progress info in crash recovery
innobase/trx/trx0sys.c:
Print trx rollback progress info in crash recovery
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
replication tests
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)
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
remove variable rli->log_pos_current.
sql/slave.cc:
Simplification of init_relay_log_pos : always initialize,
remove variable rli->log_pos_current.
sql/slave.h:
Simplification of init_relay_log_pos : always initialize,
remove variable rli->log_pos_current.
|
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| | |
("Event too big" etc), stop this thread instead of going on
with the next event, which would certainly lead to slave's data
corruption.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
LOAD DATA LOCAL INFILE was not replicated correctly
VC++Files/bdb/bdb.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/Berkeley_DB.dsw:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_archive.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_buildall.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_checkpoint.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_deadlock.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_dll.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_dump.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_java.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_load.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_printlog.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_recover.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_stat.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_static.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_static1.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_tcl.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_test.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_upgrade.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_verify.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/ex_access.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/ex_btrec.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/ex_env.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/ex_lock.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/ex_mpool.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/ex_tpcb.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/excxx_access.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/excxx_btrec.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/excxx_env.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/excxx_lock.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/excxx_mpool.dsp:
Updated VC++ files +end space removed
VC++Files/bdb/build_win32/excxx_tpcb.dsp:
Updated VC++ files +end space removed
VC++Files/client/mysql.dsp:
Updated VC++ files +end space removed
VC++Files/client/mysqladmin.dsp:
Updated VC++ files +end space removed
VC++Files/client/mysqlcheck.dsp:
Updated VC++ files +end space removed
VC++Files/client/mysqlclient.dsp:
Updated VC++ files +end space removed
VC++Files/client/mysqlclient.dsw:
Updated VC++ files +end space removed
VC++Files/client/mysqldump.dsp:
Updated VC++ files +end space removed
VC++Files/client/mysqlimport.dsp:
Updated VC++ files +end space removed
VC++Files/client/mysqlshow.dsp:
Updated VC++ files +end space removed
VC++Files/comp_err/comp_err.dsp:
Updated VC++ files +end space removed
VC++Files/contrib/asm386/zlibvc.dsp:
Updated VC++ files +end space removed
VC++Files/contrib/asm386/zlibvc.dsw:
Updated VC++ files +end space removed
VC++Files/contrib/minizip/zlibvc.dsp:
Updated VC++ files +end space removed
VC++Files/contrib/minizip/zlibvc.dsw:
Updated VC++ files +end space removed
VC++Files/dbug/dbug.dsp:
Updated VC++ files +end space removed
VC++Files/dbug/dbug.dsw:
Updated VC++ files +end space removed
VC++Files/heap/heap.dsp:
Updated VC++ files +end space removed
VC++Files/innobase/innobase.dsp:
Updated VC++ files +end space removed
VC++Files/isam/isam.dsp:
Updated VC++ files +end space removed
VC++Files/isam/isam.dsw:
Updated VC++ files +end space removed
VC++Files/isamchk/isamchk.dsp:
Updated VC++ files +end space removed
VC++Files/libmysql/libmysql.dsp:
Updated VC++ files +end space removed
VC++Files/libmysql/libmysql.dsw:
Updated VC++ files +end space removed
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Updated VC++ files +end space removed
VC++Files/libmysqld/libmysqld.dsp:
Updated VC++ files +end space removed
VC++Files/libmysqltest/myTest.dsp:
Updated VC++ files +end space removed
VC++Files/libmysqltest/mytest.dsw:
Updated VC++ files +end space removed
VC++Files/merge/merge.dsp:
Updated VC++ files +end space removed
VC++Files/merge/merge.dsw:
Updated VC++ files +end space removed
VC++Files/my_print_defaults/my_print_defaults.dsp:
Updated VC++ files +end space removed
VC++Files/myisam/myisam.dsp:
Updated VC++ files +end space removed
VC++Files/myisamchk/myisamchk.dsp:
Updated VC++ files +end space removed
VC++Files/myisamlog/myisamlog.dsp:
Updated VC++ files +end space removed
VC++Files/myisammrg/myisammrg.dsp:
Updated VC++ files +end space removed
VC++Files/myisampack/myisampack.dsp:
Updated VC++ files +end space removed
VC++Files/mysql.dsp:
Updated VC++ files +end space removed
VC++Files/mysql.dsw:
Updated VC++ files +end space removed
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Updated VC++ files +end space removed
VC++Files/mysqlcheck/mysqlcheck.dsp:
Updated VC++ files +end space removed
VC++Files/mysqldemb/mysqldemb.dsp:
Updated VC++ files +end space removed
VC++Files/mysqlmanager/MySqlManager.dsp:
Updated VC++ files +end space removed
VC++Files/mysqlmanager/mysqlmanager.dsw:
Updated VC++ files +end space removed
VC++Files/mysqlserver/mysqlserver.dsp:
Updated VC++ files +end space removed
VC++Files/mysqlshutdown/myshutdown.dsp:
Updated VC++ files +end space removed
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
Updated VC++ files +end space removed
VC++Files/mysqlwatch/mysqlwatch.dsp:
Updated VC++ files +end space removed
VC++Files/mysys/mysys.dsp:
Updated VC++ files +end space removed
VC++Files/mysys/mysys.dsw:
Updated VC++ files +end space removed
VC++Files/pack_isam/pack_isam.dsp:
Updated VC++ files +end space removed
VC++Files/perror/perror.dsp:
Updated VC++ files +end space removed
VC++Files/regex/regex.dsp:
Updated VC++ files +end space removed
VC++Files/regex/regex.dsw:
Updated VC++ files +end space removed
VC++Files/replace/replace.dsp:
Updated VC++ files +end space removed
VC++Files/sql/mysqld.dsp:
Updated VC++ files +end space removed
VC++Files/sql/mysqld.dsw:
Updated VC++ files +end space removed
VC++Files/sql/mysqldmax.dsp:
Updated VC++ files +end space removed
VC++Files/sql/old/mysqld.dsw:
Updated VC++ files +end space removed
VC++Files/strings/MASM6x/strings.dsp:
Updated VC++ files +end space removed
VC++Files/strings/MASM6x/strings.dsw:
Updated VC++ files +end space removed
VC++Files/strings/backup/strings.dsp:
Updated VC++ files +end space removed
VC++Files/strings/backup/strings.dsw:
Updated VC++ files +end space removed
VC++Files/strings/noMASM/strings.dsp:
Updated VC++ files +end space removed
VC++Files/strings/noMASM/strings.dsw:
Updated VC++ files +end space removed
VC++Files/strings/strings.dsp:
Updated VC++ files +end space removed
VC++Files/strings/strings.dsw:
Updated VC++ files +end space removed
VC++Files/test1/test1.dsp:
Updated VC++ files +end space removed
VC++Files/thr_insert_test/thr_insert_test.dsp:
Updated VC++ files +end space removed
VC++Files/thr_test/thr_test.dsp:
Updated VC++ files +end space removed
VC++Files/vio/vio.dsp:
Updated VC++ files +end space removed
VC++Files/zlib/zlib.dsp:
Updated VC++ files +end space removed
include/my_global.h:
Always include errno.h
sql/log_event.cc:
LOAD DATA INFILE is not replicated if replicate_*_table is set
sql/mf_iocache.cc:
LOAD DATA LOCAL INFILE was not replicated correctly
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
include/global.h:
Portability fix
(Using errno before including errno.h can give big problems on Linux)
|
| | | | |
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
mysql-test/Makefile.am:
Auto merged
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
sql/sql_show.cc:
used correct function
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Monty)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
include/violite.h:
postmerging fix
libmysqld/lib_vio.c:
postmerging fix
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
increased compatibility
postmerge changing
sql/sql_class.h:
increased compatibility
sql/sql_show.cc:
postmerge changing
vio/viosocket.c:
increased compatibility
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | | |
sql/sql_parse.cc:
Auto merged
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
include/violite.h:
port added to reported parameters
libmysqld/lib_vio.c:
port added to reported parameters
sql/sql_class.h:
port added to reported parameters
sql/sql_parse.cc:
port added to reported parameters
sql/sql_show.cc:
SHOW PROCESSLIST will report port number if it is possible
vio/viosocket.c:
port added to reported parameters
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fixed bug in RAND() usage in mysqlbinlog
configure.in:
Added detection if pthread_attr_getstacksize() exists
include/thr_lock.h:
Fixed wrong comment
sql/log_event.cc:
Fixed bug in RAND() usage in mysqlbinlog
sql/mysqld.cc:
Portablity fix
sql/repl_failsafe.cc:
Set host_or_ip for system threads (to make other code simpler)
sql/slave.cc:
Set host_or_ip for system threads (to make other code simpler)
sql/sql_class.cc:
Set host_or_ip for system threads (to make other code simpler)
sql/sql_insert.cc:
Set host_or_ip for system threads (to make other code simpler)
sql/sql_show.cc:
Set host_or_ip for system threads (to make other code simpler)
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
|
|\ \ \ \ |
|
| |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | | |
sql/sql_show.cc:
Auto merged
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
contain NULL values (which is the case for a crashed .frm file).
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Remove DEBUG_ASSERT if MySQL internally names a UNIQUE index as the PRIMARY KEY, but inside InnoDB there is no primary key for the table
sql/ha_innodb.cc:
Remove DEBUG_ASSERT if MySQL internally names a UNIQUE index as the PRIMARY KEY, but inside InnoDB there is no primary key for the table
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Add docs to store_lock()
sql/ha_innodb.cc:
Add docs to store_lock()
|
|\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
command:
load data infile 'filename' into table db.table;
|
|\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
mysql-test
innobase/ibuf/ibuf0ibuf.c:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_analyse.h:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
mysql-test/t/rpl000015.slave-mi:
Auto merged
mysql-test/t/rpl_rotate_logs.slave-mi:
Auto merged
mysql-test/mysql-test-run.sh:
merge with 3.23
scripts/make_binary_distribution.sh:
merge with 3.23
sql/share/czech/errmsg.txt:
merge with 3.23
sql/share/danish/errmsg.txt:
merge with 3.23
sql/share/dutch/errmsg.txt:
merge with 3.23
sql/share/estonian/errmsg.txt:
merge with 3.23
sql/share/swedish/errmsg.txt:
merge with 3.23
sql/sql_class.cc:
merge with 3.23 (Keep local copy)
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
filenames on some OS
mysql-test/t/rpl_rotate_logs.slave-mi:
Rename: mysql-test/t/rpl_rotate_logs-slave-master-info.opt -> mysql-test/t/rpl_rotate_logs.slave-mi
mysql-test/t/rpl000015.slave-mi:
Rename: mysql-test/t/rpl000015-slave-master-info.opt -> mysql-test/t/rpl000015.slave-mi
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Ensured that all errors messages ends with: ",
sql/share/czech/errmsg.txt:
Fixed new line terminations
sql/share/danish/errmsg.txt:
Fixed "syntax" errors.
sql/share/dutch/errmsg.txt:
Fixed "syntax" errors.
sql/share/english/errmsg.txt:
Fixed "syntax" errors.
sql/share/estonian/errmsg.txt:
Fixed "syntax" errors.
sql/share/french/errmsg.txt:
Fixed "syntax" errors.
sql/share/german/errmsg.txt:
Fixed "syntax" errors.
sql/share/greek/errmsg.txt:
Fixed "syntax" errors.
sql/share/hungarian/errmsg.txt:
Fixed "syntax" errors.
sql/share/italian/errmsg.txt:
Fixed "syntax" errors.
sql/share/japanese/errmsg.txt:
Fixed "syntax" errors.
sql/share/korean/errmsg.txt:
Fixed "syntax" errors.
sql/share/norwegian-ny/errmsg.txt:
Fixed "syntax" errors.
sql/share/norwegian/errmsg.txt:
Fixed "syntax" errors.
sql/share/polish/errmsg.txt:
Fixed "syntax" errors.
sql/share/portuguese/errmsg.txt:
Fixed "syntax" errors.
sql/share/romanian/errmsg.txt:
Fixed "syntax" errors.
sql/share/russian/errmsg.txt:
Fixed "syntax" errors.
sql/share/slovak/errmsg.txt:
Fixed "syntax" errors.
sql/share/spanish/errmsg.txt:
Fixed "syntax" errors.
sql/share/swedish/errmsg.txt:
Fixed "syntax" errors.
sql/share/ukrainian/errmsg.txt:
Fixed "syntax" errors.
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Add diagnostic prints if insert buffer merge is tried to a page whose type is not an index page, try to recover from the situation by discarding the insert buffer records
innobase/ibuf/ibuf0ibuf.c:
Add diagnostic prints if insert buffer merge is tried to a page whose type is not an index page, try to recover from the situation by discarding the insert buffer records
|
| | |\ \ \ |
|
| | | | | | |
|
| | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
into sanja.is.com.ua:/home/bell/mysql/work-3.23
|
| | | | | | | |
|