standards (and help Doxygen generating good documentation).
sql/ha_ndbcluster.cc:
Renaming MASTER_INFO to Master_info.
sql/log_event.cc:
Renaming MASTER_INFO to Master_info.
sql/repl_failsafe.cc:
Renaming MASTER_INFO to Master_info.
sql/repl_failsafe.h:
Renaming MASTER_INFO to Master_info.
sql/rpl_mi.cc:
Renaming MASTER_INFO to Master_info.
sql/rpl_mi.h:
Renaming MASTER_INFO to Master_info.
sql/rpl_rli.h:
Renaming MASTER_INFO to Master_info.
sql/slave.cc:
Renaming MASTER_INFO to Master_info.
sql/slave.h:
Renaming MASTER_INFO to Master_info.
sql/sql_repl.cc:
Renaming MASTER_INFO to Master_info.
sql/sql_repl.h:
Renaming MASTER_INFO to Master_info.
(and be more friendly to Doxygen by removing unnecessary typedefs).
sql/log.cc:
Renaming struct st_relay_log_info to class Relay_log_info.
sql/log.h:
Renaming struct st_relay_log_info to class Relay_log_info.
sql/log_event.cc:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/log_event.h:
Renaming struct st_relay_log_info to class Relay_log_info.
Renaming RELAY_LOG_INFO to Relay_log_info.
Removing typedef RELAY_LOG_INFO.
sql/log_event_old.cc:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/log_event_old.h:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/rpl_mi.h:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/rpl_record.cc:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/rpl_record.h:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/rpl_record_old.cc:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/rpl_record_old.h:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/rpl_rli.cc:
Renaming struct st_relay_log_info to class Relay_log_info.
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/rpl_rli.h:
Renaming struct st_relay_log_info to class Relay_log_info.
Renaming RELAY_LOG_INFO to Relay_log_info.
Removing typedef RELAY_LOG_INFO.
sql/rpl_utility.cc:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/rpl_utility.h:
Renaming struct st_relay_log_info to class Relay_log_info.
Renaming RELAY_LOG_INFO to Relay_log_info.
Removing typedef RELAY_LOG_INFO.
sql/slave.cc:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/slave.h:
Renaming struct st_relay_log_info to class Relay_log_info.
Renaming RELAY_LOG_INFO to Relay_log_info.
Removing typedef RELAY_LOG_INFO.
sql/sql_binlog.cc:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/sql_class.h:
Renaming struct st_relay_log_info to class Relay_log_info.
Renaming RELAY_LOG_INFO to Relay_log_info.
Removing typedef RELAY_LOG_INFO.
sql/sql_repl.cc:
Renaming RELAY_LOG_INFO to Relay_log_info.
This patch provides compile helper scripts only,
no server logic is affected.
Before this patch, GCOV and GPROF build scripts were only provided for
pentium platforms.
With this patch, pentium, pentium64 and amd64 platforms have associated
helper build scripts.
The GCOV and GPROF specific compilation flags are set once in SETUP.sh,
to avoid code duplication.
BUILD/SETUP.sh:
Moved GCOV and GPROF flags to compile-pentium-{gcov,gprof) to SETUP.sh
BUILD/compile-pentium-gcov:
Moved GCOV and GPROF flags to compile-pentium-{gcov,gprof) to SETUP.sh
BUILD/compile-pentium-gprof:
Moved GCOV and GPROF flags to compile-pentium-{gcov,gprof) to SETUP.sh
BUILD/compile-amd64-gcov:
Added helper scripts for GCOV and GPROF builds.
BUILD/compile-amd64-gprof:
Added helper scripts for GCOV and GPROF builds.
BUILD/compile-pentium64-gcov:
Added helper scripts for GCOV and GPROF builds.
BUILD/compile-pentium64-gprof:
Added helper scripts for GCOV and GPROF builds.
into ramayana.hindu.god:/home/tsmith/m/bk/inno/aug13/51
storage/innobase/fsp/fsp0fsp.c:
Use local (null merge)
storage/innobase/handler/ha_innodb.cc:
Use local (null merge)
storage/innobase/include/fsp0fsp.h:
Use local (null merge)
storage/innobase/include/univ.i:
Use local (null merge)
storage/innobase/log/log0recv.c:
Use local (null merge)
storage/innobase/os/os0file.c:
Use local (null merge)
storage/innobase/srv/srv0srv.c:
Use local (null merge)
storage/innobase/trx/trx0trx.c:
Use local (null merge)
Apply innodb-5.0-ss1696 snapshot
Fixes:
- Bug#20090: InnoDB: Error: trying to declare trx to enter InnoDB
- Bug#23710: crash_commit_before fails if innodb_file_per_table=1
At InnoDB startup consider the case where log scan went beyond
checkpoint_lsn as a crash and initiate crash recovery code path.
- Bug#28781: InnoDB increments auto-increment value incorrectly with ON DUPLICATE KEY UPDATE
We need to do some special AUTOINC handling for the following case:
INSERT INTO t (c1,c2) VALUES(x,y) ON DUPLICATE KEY UPDATE ...
We need to use the AUTOINC counter that was actually used by
MySQL in the UPDATE statement, which can be different from the
value used in the INSERT statement.
- Bug#29097: fsp_get_available_space_in_free_extents() is capped at 4TB
Fix by typecasting the variables before multiplying them, so that the
result of the multiplication is of type "unsigned long long".
- Bug#29155: Innodb "Parallel recovery" is not prevented
Fix by enabling file locking on FreeBSD. It has been disabled because
InnoDB has refused to start on FreeBSD & LinuxThreads, but now it
starts just fine.
innobase/fsp/fsp0fsp.c:
Apply innodb-5.0-ss1696 snapshot
Revision r1614:
branches/5.0:
Merge r1605 from trunk:
Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
by typecasting the variables before multiplying them, so that the result of
the multiplication is of type "unsigned long long".
I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
use it without overwriting it with zeroes (by commenting the code that
overwrites :newraw files).
New type ullint is introduced with the sole purpose of shortening
"unsigned long long", please do not define it to something else than
"unsigned long long".
Approved by: Heikki
innobase/include/fsp0fsp.h:
Apply innodb-5.0-ss1696 snapshot
Revision r1614:
branches/5.0:
Merge r1605 from trunk:
Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
by typecasting the variables before multiplying them, so that the result of
the multiplication is of type "unsigned long long".
I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
use it without overwriting it with zeroes (by commenting the code that
overwrites :newraw files).
New type ullint is introduced with the sole purpose of shortening
"unsigned long long", please do not define it to something else than
"unsigned long long".
Approved by: Heikki
innobase/include/univ.i:
Apply innodb-5.0-ss1696 snapshot
Revision r1614:
branches/5.0:
Merge r1605 from trunk:
Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
by typecasting the variables before multiplying them, so that the result of
the multiplication is of type "unsigned long long".
I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
use it without overwriting it with zeroes (by commenting the code that
overwrites :newraw files).
New type ullint is introduced with the sole purpose of shortening
"unsigned long long", please do not define it to something else than
"unsigned long long".
Approved by: Heikki
innobase/log/log0recv.c:
Apply innodb-5.0-ss1696 snapshot
Revision r1608:
branches/5.0: Bug#23710
Back port of r1607 from trunk
At InnoDB startup consider the case where log scan went beyond checkpoint_lsn as a crash and initiate crash recovery code path.
reviewed by: Heikki
innobase/os/os0file.c:
Apply innodb-5.0-ss1696 snapshot
Revision r1615:
branches/5.0:
Merge r1613 from trunk:
Fix Bug#29155 by enabling file locking on FreeBSD.
It has been disabled because InnoDB has refused to start on
FreeBSD & LinuxThreads, but now it starts just fine.
Approved by: Heikki
innobase/srv/srv0srv.c:
Apply innodb-5.0-ss1696 snapshot
Revision r1552:
branches/5.0:
Fix Bug#20090 as suggested in the bug followup by Heikki.
Approved by: Heikki
innobase/trx/trx0trx.c:
Apply innodb-5.0-ss1696 snapshot
Revision r1596:
branches/5.0: Merge r1595 from trunk:
trx_commit_for_mysql(): Avoid acquiring and releasing kernel_mutex when
trx->sess or trx_dummy_sess is non-NULL.
sql/ha_innodb.cc:
Apply innodb-5.0-ss1696 snapshot
Revision r1614:
branches/5.0:
Merge r1605 from trunk:
Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
by typecasting the variables before multiplying them, so that the result of
the multiplication is of type "unsigned long long".
I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
use it without overwriting it with zeroes (by commenting the code that
overwrites :newraw files).
New type ullint is introduced with the sole purpose of shortening
"unsigned long long", please do not define it to something else than
"unsigned long long".
Approved by: Heikki
Revision r1695:
branches/5.0: Merge a change from MySQL AB:
ChangeSet@1.2463.166.1 2007-06-20 19:22:27+03:00 monty@mysql.fi
Allow multiple calls to mysql_server_end()
(Part of fix for Bug 25621 Error in my_thread_global_end(): 1 threads
didn't exit)
Give correct error message if InnoDB table is not found
(This allows us to drop a an innodb table that is not in the InnoDB registery)
ha_innodb.cc:
Give correct error message if InnoDB table is not found.
(This allows us to drop a an innodb table that is not in the InnoDB
registery)
Revision r1606:
branches/5.0: Formatting corrections.
spotted by: Vasil
Revision r1691:
branches/5.0: Merge a change from MySQL AB:
ChangeSet@1.2463.261.1 2007-07-20 14:17:15+03:00 gkodinov@magare.gmz
Bug 29644: alter table hangs if records locked in share mode
by long running transaction
On Windows opened files can't be deleted. There was a special
upgraded lock mode (TL_WRITE instead of TL_WRITE_ALLOW_READ)
in ALTER TABLE to make sure nobody has the table opened
when deleting the old table in ALTER TABLE. This special mode
was causing ALTER TABLE to hang waiting on a lock inside InnoDB.
This special lock is no longer necessary as the server is
closing the tables it needs to delete in ALTER TABLE.
Fixed by removing the special lock.
Note that this also reverses the fix for bug 17264 that deals with
another consequence of this special lock mode being used.
sql/ha_innodb.cc: Bug 29644: reverse the (now excessive) fix
for bug 17264 (but leave the test case).
Revision r1601:
branches/5.0: Fix for bug#28781
We need to do some special AUTOINC handling for the following case:
INSERT INTO t (c1,c2) VALUES(x,y) ON DUPLICATE KEY UPDATE ...
We need to use the AUTOINC counter that was actually used by
MySQL in the UPDATE statement, which can be different from the
value used in the INSERT statement.
approved by: Sunny
Revision r1692:
branches/5.0: Merge a change from MySQL AB:
ChangeSet@1.2463.267.1 2007-07-30 17:14:34+04:00 evgen@local
Bug 24989: The DEADLOCK error is improperly handled by InnoDB.
When innodb detects a deadlock it calls ha_rollback_trans() to rollback the
main transaction. But such action isn't allowed from inside of triggers and
functions. When it happen the 'Explicit or implicit commit' error is thrown
even if there is no commit/rollback statements in the trigger/function. This
leads to the user confusion.
Now the convert_error_code_to_mysql() function doesn't call the
ha_rollback_trans() function directly but rather calls the
mark_transaction_to_rollback function and returns an error.
The sp_rcontext::find_handler() now doesn't allow errors to be caught by the
trigger/function error handlers when the thd->is_fatal_sub_stmt_error flag
is set. Procedures are still allowed to catch such errors.
The sp_rcontext::find_handler function now accepts a THD handle as a parameter.
The transaction_rollback_request and the is_fatal_sub_stmt_error flags are
added to the THD class. The are initialized by the THD class constructor.
Now the ha_autocommit_or_rollback function rolls back main transaction
when not in a sub statement and the thd->transaction_rollback_request
is set.
The THD::restore_sub_statement_state function now resets the
thd->is_fatal_sub_stmt_error flag on exit from a sub-statement.
innodb-big.test, innodb-big.result:
Added a test case for the bug 24989: The DEADLOCK error is improperly
handled by InnoDB.
sql/ha_innodb.cc:
Bug 24989: The DEADLOCK error is improperly handled by InnoDB.
Now the convert_error_code_to_mysql() function doesn't call the
ha_rollback_trans() function directly but rather calls the
mark_transaction_to_rollback function and returns an error.
Revision r1693:
branches/5.0: Merge a change from MySQL AB:
ChangeSet@1.2489.5.1 2007-07-31 17:42:48+04:00 evgen@local
ha_innodb.cc:
Warning fixed.
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result:
Auto merged
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
Auto merged
sql/field.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/field.h:
Manual merge
mysql_ha_open calls mysql_ha_close on the error path (unsupported) to close the (opened) table before inserting it into the tables hash list handler_tables_hash) but mysql_ha_close only closes tables which are on the hash list, causing the table to be left open and locked.
This change moves the table close logic into a separate function that is always called on the error path of mysql_ha_open or on a normal handler close (mysql_ha_close).
mysql-test/r/handler.result:
Bug#25856 test result
mysql-test/t/handler.test:
Bug#25856 test case
sql/sql_handler.cc:
Move the table close logic into a separate function that is always called on the error path of mysql_ha_open or on a normal handler close
trigger tests, to match build_table_filename behavior.
mysql-test/t/ps_1general.test:
Adjust how the datadir file name is normalized, to match new
build_table_filename behavior. This fixes the test result
when run with the embedded server.
mysql-test/t/trigger.test:
Adjust how the datadir file name is normalized, to match new
build_table_filename behavior. This fixes the test result
when run with the embedded server.
including a small change to build_table_filename().
mysql-test/mysql-test-run.pl:
Remove unused bad merge bitrot code. This chunk of code is a repeat
copy of an earlier chunk, and should never have been here.
mysql-test/r/innodb.result:
Updates to allow innodb.test to be run with --embedded-server
mysql-test/suite/binlog/r/binlog_innodb.result:
Updates to allow innodb.test to be run with --embedded-server
mysql-test/suite/binlog/t/binlog_innodb.test:
Updates to allow innodb.test to be run with --embedded-server
mysql-test/t/innodb.test:
Updates to allow innodb.test to be run with --embedded-server
sql/sql_table.cc:
build_table_filename(): Don't add FN_ROOTDIR to mysql_data_home if
it's already there. This is done to make it easier to write tests
which check the output of various error messages, and work with
both the embedded server (mysql_data_home is full path, including
trailing FN_ROOTDIR) and normal server (mysql_data_home is just ".").
into synthia.local:/home/mydev/mysql-5.1-axmrg
mysql-test/r/show_check.result:
Auto merged
mysql-test/t/show_check.test:
Auto merged
sql/sql_insert.cc:
Auto merged
The patch changes the test case only.
The fix is to replace all 'sleep's with wait_condition. This makes
the test deterministic and also ~300 times faster.
mysql-test/r/lock_multi.result:
Update result.
mysql-test/t/lock_multi.test:
A fix for Bug#29049 lock_multi fails in rare case.
Replace all 'sleep's with wait_condition. This makes
the test deterministic and also ~300 times faster.
Changed patch to Mats suggestion from review. Patch is for Bug#30209
.del-wait_for_slave_running_off.inc:
Delete: mysql-test/include/wait_for_slave_running_off.inc
BitKeeper/deleted/.del-wait_for_slave_running_off.inc:
Delete: mysql-test/include/wait_for_slave_running_off.inc
mysql-test/suite/rpl/t/rpl_packet.test:
Changed patch to Mats suggestion
into gleb.loc:/home/uchum/work/bk/5.1-opt
sql/field.cc:
Auto merged
BitKeeper/deleted/.del-readme.txt~3:
Auto merged
sql/field.h:
Auto merged
sql/handler.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/unireg.h:
Auto merged
sql/sql_select.cc:
Merge with main tree.
