- Send error to client when mysql_change_db fails.
sql/sql_db.cc:
Added a note to comment for mysql_change_db that it will not send any error to the client.
sql/sql_parse.cc:
Call net_send_error(thd) if mysql_change_db fails.
Remove comments claiming that mysql_change_db sends error the the client.
Add a big fat warning for future programmers that MySQL may call ::store_lock() also with lock 'type' TL_IGNORE; my ignorance of this caused bug 9670
sql/ha_innodb.cc:
Add a big fat warning for future programmers that MySQL may call ::store_lock() also with lock 'type' TL_IGNORE; my ignorance of this caused bug 9670
into hundin.mysql.fi:/home/heikki/mysql-5.0
innobase/fil/fil0fil.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/t/ctype_ucs_binlog.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_innodb.cc:
Auto merged
Added a test in connection with the fix for
bug #6106.
view.result, view.test:
Added test cases for bugs #6106/6107.
sql_show.cc:
The addition of the case for items of the type REF_ITEM in the
function uses_only_table_name_fields became necessary after
the fix for bug #6106.
sql_base.cc:
The problem was due to the fact that two different column
references were glued together though one of them belonged to
a subquery while another to an outer query. This caused
eventually a wrong calculation of values for the used_tables
attribute.
sql/sql_base.cc:
The problem was due to the fact that two different column
references were glued together though one of them belonged to
a subquery while another to an outer query. This caused
eventually a wrong calculation of values for the used_tables
attribute.
sql/sql_show.cc:
The addition of the case for items of the type REF_ITEM in the
function uses_only_table_name_fields became necessary after
the fix for bug #6106.
mysql-test/t/view.test:
Added test cases for bugs #6106/6107.
mysql-test/r/view.result:
Added test cases for bugs #6106/6107.
mysql-test/t/information_schema.test:
Added a test in connection with the fix for
bug #6106.
mysql-test/r/information_schema.result:
Added a test in connection with the fix for
bug #6106.
refuse to start up if it is not. (Bug #9815)
sql/handler.cc:
Add ha_storage_engine_is_enabled function.
sql/handler.h:
Declare ha_storage_engine_is_enabled()
sql/mysqld.cc:
Abort startup if the specified default storage engine is
not available.
mysql-test/r/ps.result:
Test results: adding tests for CALL statement in prepared mode.
mysql-test/t/ps.test:
Adding tests for CALL statement in prepared mode.
innobase/fil/fil0fil.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/t/ctype_ucs_binlog.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
scripts/make_binary_distribution.sh:
SCCS merged
BitKeeper/deleted/.del-Do-compile~d1a6d7e535befea3:
Auto merged
BitKeeper/deleted/.del-Makefile.am~8eda4336dfcaefc:
Auto merged
BitKeeper/deleted/.del-mysqld_error.txt~95f167eb567c789d:
Auto merged
scripts/Makefile.am:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
BitKeeper/deleted/.del-texi2html~74632fe370dcec73:
Auto merged
configure.in:
- manual merge
support-files/mysql.spec.sh:
- manual merge
innobase/fil/fil0fil.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/t/ctype_ucs_binlog.test:
Auto merged
Fix part of bug #9670: if MySQL calls ::store_lock with TL_IGNORE, do not change prebuilt->select_lock_type; this fix may heal the assertion failures reported in UPDATE and multi-table UPDATE; it is not clear if this fixes the problems in OPTIMIZE TABLE
sql/ha_innodb.cc:
Fix part of bug #9670: if MySQL calls ::store_lock with TL_IGNORE, do not change prebuilt->select_lock_type; this fix may heal the assertion failures reported in UPDATE and multi-table UPDATE; it is not clear if this fixes the problems in OPTIMIZE TABLE
into mysql.com:/space/my/mysql-4.1-build
BitKeeper/deleted/.del-Bootstrap~bfc426bd800ccc3a:
Auto merged
BitKeeper/deleted/.del-Do-compile~d1a6d7e535befea3:
Auto merged
BitKeeper/deleted/.del-Do-pkg~5079e47cde0baad8:
Auto merged
BitKeeper/deleted/.del-mysql-copyright-2~e73ec01547206fec:
Auto merged
BitKeeper/deleted/.del-mysql-copyright~56fc330ae63cfe03:
Auto merged
- Added a stub scripts/fill_help_tables.sql file to satisfy the build dependencies
- Removed scripts/fill_help_tables.sh and updated scripts/Makefile.am accordingly
The fill_help_tables.sql stub will be replaced with the approriate content when building the
official source distribution via Bootstrap - it's now autogenerated on the documentation server
and will be copied into place before packing up the source distribution.
scripts/Makefile.am:
- removed fill_help_tables.sh and the creation of fill_help_tables.sql from the Makefile
(fill_help_tables.sql is now generated on the documentation server and will be added to
the offical source distribution during the Bootstrap
support-files/mysql.spec.sh:
- fixed a typo
causes system crash.
mysql-test/r/sp.result:
Added test case for BUG#9674.
mysql-test/t/sp.test:
Added test case for BUG#9674.
sql/item.cc:
Returning a pointer to a local variable is not a good idea.
Better to use parameter which is there for exactly this purpose.
mysql-test/r/sp.result:
Added test case for BUG#6129.
mysql-test/t/sp.test:
Added test case for BUG#6129.
sql/sp_pcontext.h:
Only need one handler counter.
sql/sql_yacc.yy:
Count handlers correctly.
innobase/dict/dict0dict.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/include/dict0dict.h:
Auto merged
innobase/row/row0mysql.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_dynrec.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/r/kill.result:
Auto merged
mysql-test/t/kill.test:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/mysqld.cc:
Auto merged
