into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
storage/innobase/log/log0log.c:
Auto merged
storage/innobase/log/log0recv.c:
Auto merged
storage/innobase/row/row0umod.c:
Auto merged
storage/innobase/trx/trx0undo.c:
Auto merged
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
client/mysqldump.c:
Add description of quote_for_like
Add quoting of \ to \\\\ in quote_for_like
Add DBUG_*
Rearranged code in dump_selected_tables so the first thing it will do is to check that the tables to dump are available
Unless --force is used, program will exit if not all specified tables can be found
Add files to dump to HASH table for easy iteration
Simpler handling of ignore_table list.
Add new error code used when table user selected to dump can not be found in db
client/mysqltest.c:
Make it possible to exec a command that fails by setting --error <errno> before the command to exec.
Check that the error returned from executed program matches the expected error.
Add DBUG_* printouts
mysql-test/mysql-test-run.sh:
export MYSQL_DUMP_DIR used in "--replace_result"
mysql-test/r/mysqldump.result:
Added test for illegal / nonexisting table and database names
mysql-test/t/mysqldump.test:
Added test for illegal / nonexisting table and database names
Added a test case for bug #11295.
item_buff.cc:
Fixed bug #11295.
This a correction for the patch of bug #11088 that takes into
account a possible NULL values of the BLOB column.
sql/item_buff.cc:
Fixed bug #11295.
This a correction for the patch of bug #11088 that takes into
account a possible NULL values of the BLOB column.
mysql-test/t/group_by.test:
Added a test case for bug #11295.
mysql-test/r/group_by.result:
Added a test case for bug #11295.
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/mysqld.cc:
Auto merged
storage/innobase/btr/btr0btr.c:
Auto merged
storage/innobase/btr/btr0cur.c:
Auto merged
storage/innobase/btr/btr0pcur.c:
Auto merged
storage/innobase/btr/btr0sea.c:
Auto merged
storage/innobase/buf/buf0buf.c:
Auto merged
storage/innobase/buf/buf0flu.c:
Auto merged
storage/innobase/buf/buf0lru.c:
Auto merged
storage/innobase/buf/buf0rea.c:
Auto merged
storage/innobase/data/data0data.c:
Auto merged
storage/innobase/data/data0type.c:
Auto merged
storage/innobase/dict/dict0boot.c:
Auto merged
storage/innobase/dict/dict0crea.c:
Auto merged
storage/innobase/dict/dict0dict.c:
Auto merged
storage/innobase/dict/dict0mem.c:
Auto merged
storage/innobase/fil/fil0fil.c:
Auto merged
storage/innobase/fsp/fsp0fsp.c:
Auto merged
storage/innobase/ibuf/ibuf0ibuf.c:
Auto merged
storage/innobase/include/btr0btr.h:
Auto merged
storage/innobase/include/btr0btr.ic:
Auto merged
storage/innobase/include/btr0cur.h:
Auto merged
storage/innobase/include/btr0cur.ic:
Auto merged
storage/innobase/include/buf0buf.h:
Auto merged
storage/innobase/include/buf0buf.ic:
Auto merged
storage/innobase/include/buf0lru.h:
Auto merged
storage/innobase/include/data0type.h:
Auto merged
storage/innobase/include/data0type.ic:
Auto merged
storage/innobase/include/dyn0dyn.h:
Auto merged
storage/innobase/include/dyn0dyn.ic:
Auto merged
storage/innobase/include/lock0lock.h:
Auto merged
storage/innobase/include/log0log.h:
Auto merged
storage/innobase/include/mach0data.h:
Auto merged
storage/innobase/include/mach0data.ic:
Auto merged
storage/innobase/include/mem0mem.ic:
Auto merged
storage/innobase/include/mtr0log.h:
Auto merged
storage/innobase/include/mtr0mtr.h:
Auto merged
storage/innobase/include/os0file.h:
Auto merged
storage/innobase/include/page0cur.h:
Auto merged
storage/innobase/include/page0cur.ic:
Auto merged
storage/innobase/include/page0page.h:
Auto merged
storage/innobase/include/page0page.ic:
Auto merged
storage/innobase/include/read0read.ic:
Auto merged
storage/innobase/include/rem0rec.h:
Auto merged
storage/innobase/include/rem0rec.ic:
Auto merged
storage/innobase/include/row0mysql.h:
Auto merged
storage/innobase/include/row0sel.ic:
Auto merged
storage/innobase/include/row0upd.ic:
Auto merged
storage/innobase/include/sync0rw.ic:
Auto merged
storage/innobase/include/trx0rseg.ic:
Auto merged
storage/innobase/include/trx0trx.h:
Auto merged
storage/innobase/include/univ.i:
Auto merged
storage/innobase/include/ut0dbg.h:
Auto merged
storage/innobase/include/ut0rnd.ic:
Auto merged
storage/innobase/lock/lock0lock.c:
Auto merged
storage/innobase/log/log0log.c:
Auto merged
storage/innobase/log/log0recv.c:
Auto merged
storage/innobase/mtr/mtr0log.c:
Auto merged
storage/innobase/mtr/mtr0mtr.c:
Auto merged
storage/innobase/os/os0file.c:
Auto merged
storage/innobase/page/page0cur.c:
Auto merged
storage/innobase/page/page0page.c:
Auto merged
storage/innobase/rem/rem0cmp.c:
Auto merged
storage/innobase/rem/rem0rec.c:
Auto merged
storage/innobase/row/row0ins.c:
Auto merged
storage/innobase/row/row0mysql.c:
Auto merged
storage/innobase/row/row0purge.c:
Auto merged
storage/innobase/row/row0row.c:
Auto merged
storage/innobase/row/row0sel.c:
Auto merged
storage/innobase/row/row0undo.c:
Auto merged
storage/innobase/row/row0upd.c:
Auto merged
storage/innobase/row/row0vers.c:
Auto merged
storage/innobase/srv/srv0start.c:
Auto merged
storage/innobase/sync/sync0sync.c:
Auto merged
storage/innobase/trx/trx0rec.c:
Auto merged
storage/innobase/trx/trx0roll.c:
Auto merged
storage/innobase/trx/trx0trx.c:
Auto merged
storage/innobase/ut/ut0dbg.c:
Auto merged
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
sql/Makefile.am:
Auto merged
sql/field.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/myisam/ft_boolean_search.c:
Auto merged
More compact and safe handling of path names.
Support for running in Windows source tree.
Use libtool wrapper, instead of messing with
library path names, and objects in .libs dir.
mtr_misc.pl:
Utility function that search aand check path names
mtr_report.pl:
Patch by Carsten, set correct reject/result/eval if not main suite
mysql-test/lib/mtr_report.pl:
Patch by Carsten, set correct reject/result/eval if not main suite
mysql-test/lib/mtr_misc.pl:
Utility function that search aand check path names
mysql-test/mysql-test-run.pl:
More compact and safe handling of path names.
Support for running in Windows source tree.
Use libtool wrapper, instead of messing with
library path names, and objects in .libs dir.
into mysql.com:/home/jimw/my/mysql-5.0-clean
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
client/mysql.cc:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
vio/viosocket.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/group_by.result:
Auto merged
sql/Makefile.am:
Auto merged
sql/field.h:
Auto merged
sql/sql_select.cc:
Auto merged
Bug#11466: Script can now get test case name
from test case file path on command line
mysql-test-run.pl:
Bug#11466: Added --skip-ndbcluster/--skip-ndb option
mtr_cases.pl:
Don't set --default-time-zone if opt file sets it
Restart the server if time zone is given in opt file
mysql-test-run.pl:
Don't remove symlink to "var" directory in cleanup
Removed duplicate/unessesary options to mysqld
mysql-test/mysql-test-run.pl:
Bug#11466: Added --skip-ndbcluster/--skip-ndb option
mysql-test/lib/mtr_cases.pl:
Bug#11466: Script can now get test case name
from test case file path on command line
Added a test case for bug #11385.
group_by.test:
Added a test case for bug #11385.
field.h:
Fixed bug #11385.
The bug was due to not defined method decimals for the class
Field_datetime.
sql/field.h:
Fixed bug #11385.
The bug was due to not defined method decimals for the class
Field_datetime.
mysql-test/t/group_by.test:
Added atest case for bug #11385.
mysql-test/r/group_by.result:
Added a test case for bug #11385.
table with an empty hostname. (Bug #11330)
mysql-test/r/grant.result:
Update results
mysql-test/t/grant.test:
Add new regression test
sql/sql_acl.cc:
Don't call strlen() on a NULL pointer.
procedure with INSERT SELECT UNION SELECT" aka "Server crashes on
re-execution of prepared INSERT ... SELECT with UNION" into 5.0 tree.
mysql-test/r/ps.result:
Manual merge.
mysql-test/t/ps.test:
Manual merge.
sql/sql_insert.cc:
Manual merge.
INSERT ... SELECT with UNION" (reviewed version).
Altough bug manifest itself only starting from 5.0 it is better to
apply fix to 4.1 to keep some assumptions true and make code more
future-proof.
mysql-test/r/ps.result:
Added test case for bug #11060 "Server crashes on re-execution of
prepared INSERT ... SELECT with UNION".
mysql-test/t/ps.test:
Added test case for bug #11060 "Server crashes on re-execution of
prepared INSERT ... SELECT with UNION".
sql/sql_insert.cc:
select_insert::prepare():
Item::fix_fields() methods operate assuming that LEX::current_select
points to the select to which current item belongs. Thus
during check_insert_fields() routine execution LEX::current_select
should point ot the first select in query since this is the
select with which items in insert list is associated.
But if we have INSERT SELECT UNION SELECT type of query
LEX::current_select will point to the fake_select_lex instead
since select_insert::prepare() is called during processing of JOIN
which corresponds to this select_lex.
So we have set LEX::current_select before calling check_insert_fields()
and restore it afterwards.
mysql-test/r/view.result:
using time_format in view (BUG#7521)
mysql-test/t/view.test:
using time_format in view (BUG#7521)
sql/item_timefunc.h:
fixed func_name reportion
into neptunus.(none):/home/msvensson/mysql/bug10365
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
configure.in:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
Added --log-bin-trust-routine-creators to server start
Increase and autoextend innodb tables
mysql-test/mysql-test-run.pl:
Added --log-bin-trust-routine-creators to server start
Increase and autoextend innodb tables
- Print warning that says display width is not supported for datatype TIMESTAMP, if user tries to create a TIMESTAMP column with display width.
- Use display width for TIMESTAMP only in type_timestamp test to make sure warning is displayed correctly.
mysql-test/include/ps_create.inc:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/alias.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/func_date_add.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/func_str.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/func_time.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/group_by.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/innodb.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_1general.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_2myisam.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_3innodb.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_4heap.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_5merge.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_6bdb.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_7ndb.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/select.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/type_timestamp.result:
When display width is used for a TIMESTAMP column a warning is printed that the display width will be ignored.
mysql-test/r/update.result:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/alias.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/func_date_add.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/func_str.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/func_time.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/group_by.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/innodb.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/ps.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/ps_4heap.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/ps_5merge.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/select.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/update.test:
Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
sql/share/errmsg.txt:
Correct swedish error message
sql/sql_parse.cc:
Print warning if datatype is TIMESTAMP and display width is used.
Corrected path to 'mysql_fix_privilege_tables'
Corrected dummy --manager-port to take integer argument
mysql-test/mysql-test-run.pl:
Corrected path to 'mysql_fix_privilege_tables'
KEY_PART_INFO::store_length, not KEY_PART_INFO::length (like range code does)
mysql-test/r/index_merge_innodb.result:
Testcase for BUG8441
mysql-test/t/index_merge_innodb.test:
Testcase for BUG8441
Added dummy --manager-port flag, for backward compatibility
Back port from 5.0, correction of paths to SSL pem files
mtr_cases.pl:
Removed hard coded exclude list for embedded server
mysql-test-run.pl:
Set environment variable MYSQL_SHOW, to be used in test cases
mysql-test/lib/mtr_cases.pl:
Removed hard coded exclude list for embedded server
mysql-test/mysql-test-run.pl:
Added dummy --manager-port flag, for backward compatibility
Back port from 5.0, correction of paths to SSL pem files
