and so the engine calls current_thd to derive transaction information;
instead we now pass THD to those functions, it looks more logical
(it makes the implicit current_thd parameter more visible).
Approved by Brian and Monty.
sql/handler.h:
cursor's creation functions in the handlerton need a THD,
it's better than have the engine call current_thd
sql/sql_cursor.cc:
pass the THD instead of letting the engine call current_thd
storage/innobase/handler/ha_innodb.cc:
use the passed THD instead of current_thd
storage/innobase/handler/ha_innodb.h:
use the passed THD instead of current_thd
into mysql.com:/home/cps/mysql/trees/5.1-runtime-new
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/sp.result:
manual merge
mysql-test/t/sp.test:
manual merge
storage/csv/ha_tina.cc:
manual merge
storage/myisam/ha_myisam.cc:
manual merge
at the moment, so we can safely do that). Update an error
mesage to make it translateable.
mysql-test/r/log_tables.result:
update result file
sql/share/errmsg.txt:
remove unused error messages
sql/sql_table.cc:
Use name of the statements rather then English words.
This way error message is translateable.
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21414
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
mysql-test/r/sp.result:
Manual merge.
mysql-test/t/sp.test:
Manual merge.
into zim.(none):/home/brian/mysql/arch-5.1
sql/ha_ndbcluster.cc:
Auto merged
sql/log.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
include/mysql/plugin.h:
Field Removed
sql/ha_ndbcluster.cc:
Field Removed
sql/ha_partition.cc:
Field Removed
sql/log.cc:
Removed Field
storage/archive/ha_archive.cc:
Removed Field
storage/blackhole/ha_blackhole.cc:
Removed Field
storage/csv/ha_tina.cc:
Removed Field
storage/example/ha_example.cc:
Removed Field
storage/federated/ha_federated.cc:
Removed Field
storage/heap/ha_heap.cc:
Removed Field
storage/innobase/handler/ha_innodb.cc:
Removed Field
storage/myisam/ha_myisam.cc:
Removed Field
storage/myisammrg/ha_myisammrg.cc:
Removed Field
A better fix for bug#10025.
Fixed test case plus added new tests.
After fixing Bug#20208 "Blobs greater than 8K are being truncated to 8K"
the fix to bug#10025 "Misleading error with COLLATE mediumtext and UNION"
became more accurate. Earlier mediumtext got converted to longtext,
although mediumtext was enough to contain the results. Now it converts
correctly to mediumtext, if the length does not exceed that and if none
of the original fields were type longtext.
Type longtext still converts correctly to type longtext, as the extra
tests prove.
mysql-test/r/union.result:
Fixed an earlier test case plus added two new tests.
mysql-test/t/union.test:
Fixed an earlier test case plus added two new tests.
when set to DISABLED
It was a silly ordering number error.
sql/events.h:
fix ordinal number, the cause for bug #22662
Inconsistent values displayed for event_scheduler when set to DISABLED
mysql-test/r/events_restart_phase0.result:
New BitKeeper file ``mysql-test/r/events_restart_phase0.result''
mysql-test/t/events_restart_phase0.log:
New BitKeeper file ``mysql-test/t/events_restart_phase0.log''
mysql-test/t/events_restart_phase0.result:
New BitKeeper file ``mysql-test/t/events_restart_phase0.result''
ALTER EVENT in stored procedure body led to a crash during the
procedure call. Affected was only ALTER EVENT which changed the
interval of the event. No problems with AT, STARTS, ENDS and so on.
mysql-test/r/events_bugs.result:
fix result
mysql-test/t/events_bugs.test:
add test case for bug 22397 : Events, crash with procedure which alters body
sql/event_data_objects.cc:
fix copy&paste error in code, which resulted in bug#22397
Events: crash with procedure which alters body
into neptunus.(none):/home/msvensson/mysql/bug22379_runtime/my51-bug22379_runtime
server-tools/instance-manager/guardian.cc:
Auto merged
server-tools/instance-manager/instance.cc:
Auto merged
server-tools/instance-manager/instance_options.cc:
Auto merged
Remove race situations that occur when removing pidfiles. Primarily each process should remove its own
pidfile, secondly it should be removed by the process that created it and _only_ if it's
certain the process is dead. Third, mysql-test-run.pl will remove the pidfile when process has been killed.
- Set state of an instance to STARTING _before_ calling instance->start()
- Check that pidfile of instance has been created before changing STARTING => STARTED
- Only remove the pidfile if IM kills an instance with SIGKILL, otherwise the instance will remove it itself
server-tools/instance-manager/guardian.cc:
If state of an instance is STARTING, chech that the instance pidfile has been created
before changing state to STARTED
Set state to STARTING before calling instance->start(), it can take some time
before it is fully started and during that time it should be in state STARTING
server-tools/instance-manager/instance.cc:
Only remove the pid file of instance manager when a SIGKILL has
been performed sucessfully
server-tools/instance-manager/instance_options.cc:
Check that fscanf returns 1 which is the number of args that should be scanned from
the pid file
into production.mysql.com:/usersnfs/jamppa/mysql-5.1-bug-20208
BitKeeper/deleted/.del-ps_6bdb.result:
Auto merged
include/mysql_com.h:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
Filter out icc specific options from cflags/libs(_r)
scripts/mysql_config.sh:
Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
Added "test" RPM package
Install all binaries "make install" would
make_binary_distribution.sh:
Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)
scripts/make_binary_distribution.sh:
Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)
support-files/mysql.spec.sh:
Removed the rest of the "bench" sub RPM, but added a new "test" sub
RPM containing the "mysql-test" directory earlier in the "bench" sub
RPM. The new sub RPM "Obsoltes" "mysql-bench" as well.
Added the rest of the binaries that "make install" would install
bin/ndb_print_backup_file
bin/ndb_print_schema_file
bin/ndb_print_sys_file
sbin/ndb_cpcd
into mysql.com:/users/lthalmann/bkroot/mysql-5.1
client/mysqldump.c:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
mysql-test/t/ndb_multi.test:
Manual merge
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
BitKeeper/etc/ignore:
auto-union
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~3:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/udf_example.c:
Auto merged
BitKeeper/deleted/.del-udf_example.def:
Delete: sql/udf_example.def
mysql-test/mysql-test-run.pl:
Manual merge 5.0->5.1
sql/Makefile.am:
Manual merge 5.0->5.1
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
BitKeeper/etc/ignore:
auto-union
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/sql_select.cc:
Auto merged
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
BitKeeper/etc/ignore:
auto-union
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/sql_select.cc:
Auto merged
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
BitKeeper/etc/ignore:
auto-union
mysql-test/t/disabled.def:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
BitKeeper/etc/ignore:
auto-union
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/sql_select.cc:
Auto merged
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
mysql-test/t/disabled.def:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/ha_ndbcluster_binlog.h:
Auto merged
sql/sql_show.cc:
Auto merged
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~7:
Auto merged
Docs/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/stacktrace.c:
Auto merged
sql/stacktrace.h:
Auto merged
include/mysql_com.h:
Fix for Bug#20208 "Blobs greater than 8K are being truncated to 8K"
sql/filesort.cc:
Added a missing break point.
sql/item.cc:
Made a function of a block of code.
sql/item.h:
Added function string_field_type()
mysql-test/mysql-test-run.pl:
fixed path for udf_example.so when running testsuite on Windows
sql/CMakeLists.txt:
Added missing udf_example
sql/Makefile.am:
Added udf_example files for make dist
sql/udf_example.c:
fix for Windows: Windows doesn't have socket.h and friends
Added replacements for strmov,bzero and memcpy_fixed when compiling standalone.
sql/udf_example.def:
BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/sql/udf_example.def
Using move_field_offset() to move field pointer to other record before
calling pack()/unpack().
sql/log_event.cc:
Using move_field_offset() to move the field pointer. It is necessary
for unpack() and pack() of BIT fields to operate correctly.
Adding debug printouts.
sql/sql_class.cc:
Using move_field_offset() to move the field pointer. It is necessary
for unpack() and pack() of BIT fields to operate correctly.
Adding debug printouts to packing of update rows event.
into trift2.:/MySQL/M50/push-5.0
configure.in:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/stacktrace.c:
Auto merged
sql/stacktrace.h:
Auto merged
