Commit graph

22116 commits

Author SHA1 Message Date
unknown
c8723e7f95 merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
2005-04-14 21:31:22 +02:00
unknown
ce22ebd02d fil0fil.c:
Add fault tolerance in the scan of .ibd files at a crash recovery; formerly a single failure of readdir_get_next caused the rest of the directory to be skipped


innobase/fil/fil0fil.c:
  Add fault tolerance in the scan of .ibd files at a crash recovery; formerly a single failure of readdir_get_next caused the rest of the directory to be skipped
2005-04-14 22:27:15 +03:00
unknown
1403fb000b TRUNCATE is always a transaction on itself. pretent we're in auto-commit mode
bug#8151
2005-04-14 18:14:54 +02:00
unknown
3c56b9a542 Merge 2005-04-14 16:10:18 +02:00
unknown
e0fdbeba7e Fixed BUG#9598: stored procedure call within stored procedure
overwrites IN variable
  and added error checking of variables for [IN]OUT parameters while
  rewriting the out parameter handling.


mysql-test/r/sp-error.result:
  New test case for non-variable argument for [IN]OUT parameters.
  (And changed to qualified names in some other error messages.)
mysql-test/r/sp.result:
  New test case for BUG#9598.
mysql-test/t/sp-error.test:
  New test case for non-variable argument for [IN]OUT parameters.
mysql-test/t/sp.test:
  New test case for BUG#9598.
sql/item.h:
  Need to distinguish between SP local variable items and other items,
  for error checking and [IN]OUT parameter handling.
sql/share/errmsg.txt:
  New error message for non-variable arguments for [IN]OUT parameters in stored procedures.
sql/sp_head.cc:
  Rewrote the [IN]OUT parameter handling in procedure invokation, to make
  it work properly when using user variables in sub-calls.
  Also added error checking for non-variable arguments for such parameters
  (and changed to qualified names for wrong number of arg. errors).
sql/sp_rcontext.cc:
  No need to keep track on the out index for an [IN]OUT parameter any more.
sql/sp_rcontext.h:
  No need to keep track on the out index for an [IN]OUT parameter any more.
2005-04-14 14:52:35 +02:00
unknown
46c63419a7 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2005-04-14 14:43:21 +02:00
unknown
78bdb7d50d Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-04-14 14:40:35 +02:00
unknown
8c2d44b7ad Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-04-14 14:37:30 +02:00
unknown
42eca41c6b Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-04-14 14:34:02 +02:00
unknown
19e8df03a1 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/export/space/pekka/ndb/version/my41
2005-04-14 14:15:34 +02:00
unknown
2fd6568905 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-04-14 14:05:46 +02:00
unknown
7480051bb4 Merge mysql.com:/usr/home/ram/work/mysql-4.1
into mysql.com:/usr/home/ram/work/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2005-04-14 16:39:42 +05:00
unknown
1b49d7380c Merge mysql.com:/usr/home/ram/work/mysql-4.0
into mysql.com:/usr/home/ram/work/mysql-4.1


client/mysqltest.c:
  Auto merged
2005-04-14 16:26:39 +05:00
unknown
7b8f4c6da0 BUG#9455 mysqladmin status crash the server
- 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.
2005-04-14 11:56:13 +02:00
unknown
fa762a1213 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-04-14 11:48:21 +02:00
unknown
b3fc44fafe Merge mysql.com:/space/my/mysql-5.0
into mysql.com:/space/my/mysql-5.0-build
2005-04-14 11:48:02 +02:00
unknown
0a72f99e86 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.bit_class
2005-04-14 14:33:28 +05:00
unknown
27b2b1fad3 Bit type: fix for create_field::create_field().
sql/field.cc:
  Bit type: fix for create_field::create_field().
  We should return saved length in case of Field_bit_as_char.
2005-04-14 14:32:25 +05:00
unknown
4d68901e6b Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/matthias/Arbeit/mysql-4.1/src-clean
2005-04-14 10:48:43 +02:00
unknown
930e30e10c Merge mysql.com:/space/my/mysql-5.0
into mysql.com:/space/my/mysql-5.0-build
2005-04-14 10:26:08 +02:00
unknown
07ee7e077a Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-04-14 10:24:16 +02:00
unknown
de8b49912c 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


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
2005-04-14 11:12:12 +03:00
unknown
c657ba2a5f Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
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
2005-04-14 10:56:29 +03:00
unknown
6a888c443c In order not to conflict with a Linux kernel header
set_bit replaced with internal_set_bit,
clear_bit replaced with internal_clear_bit.
2005-04-14 11:13:08 +05:00
unknown
1c2c6bba1c Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-04-13 23:11:56 -07:00
unknown
cfefd88d37 information_schema.result, information_schema.test:
Added a test in connection with the fix for
  bug .
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 .
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 .
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 .
mysql-test/r/information_schema.result:
  Added a test in connection with the fix for
  bug .
2005-04-13 23:06:37 -07:00
unknown
d10aba1b0f Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/export/space/pekka/ndb/version/my41
2005-04-14 05:01:44 +02:00
unknown
e687d6beae Check that the default storage engine is really available, and
refuse to start up if it is not. (Bug )


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.
2005-04-13 18:25:31 -07:00
unknown
0914b0125b Don't allow the server to start up when an invalid user is
specified via --user or in configuration. (Bug )


sql/mysqld.cc:
  Actually die if we an invalid user is specified.
2005-04-13 15:43:29 -07:00
unknown
8487a67bf3 Merge mysql.com:/home/cps/mysql/trees/mysql-4.1
into mysql.com:/home/cps/mysql/trees/mysql-5.0


mysys/default.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
2005-04-14 01:57:52 +04:00
unknown
82231c24c4 post review fix
mysys/default.c:
  cleanup + check for the last line in the file in "!include" directive processing
2005-04-14 01:39:24 +04:00
unknown
11b666fb49 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-13 12:46:19 -07:00
unknown
c23c4c7cfa Allow SQLCOM_CALL in prepared mode.
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.
2005-04-13 12:36:15 -07:00
unknown
3155bc81c2 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
sql/ha_innodb.cc:
  Auto merged
scripts/make_binary_distribution.sh:
  SCCS merged
2005-04-13 21:24:49 +03:00
unknown
200dca7f40 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-04-13 20:14:45 +02:00
unknown
75663f09d3 Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0-build


support-files/mysql.spec.sh:
  Auto merged
2005-04-13 19:56:38 +02:00
unknown
efc03df645 Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build


support-files/mysql.spec.sh:
  Auto merged
2005-04-13 19:51:55 +02:00
unknown
ce18d92632 - fixed a date for a changelog entry in the RPM spec file (s/Mar/Apr/) - RPM complains about wrongly
ordered entries.


support-files/mysql.spec.sh:
  - fixed a date for a changelog entry (s/Mar/Apr/) - RPM complains about wrongly ordered entries.
2005-04-13 19:50:54 +02:00
unknown
3d73ea281d - After merge fixes
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
2005-04-13 19:46:26 +02:00
unknown
9c2446f339 Merge from 4.1
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
2005-04-13 10:38:11 -07:00
unknown
a40ecb4818 ha_innodb.cc:
Fix part of bug : 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 : 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
2005-04-13 20:21:28 +03:00
unknown
c80e4f1aff - removed more build tools that are now maintained seperately
BitKeeper/deleted/.del-Do-solaris-pkg~43f194aa28e68532:
  Delete: Build-tools/Do-solaris-pkg
BitKeeper/deleted/.del-Do-hpux-depot~d69e0b7c7f19d3:
  Delete: Build-tools/Do-hpux-depot
2005-04-13 19:18:22 +02:00
unknown
c9d8d10983 Merge mysql.com:/space/my/mysql-4.0-build
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
2005-04-13 19:07:06 +02:00
unknown
e621d27c77 - Cleanup: removed obsolete build tools (build toolchain is now maintained sepearately)
BitKeeper/deleted/.del-Bootstrap~bfc426bd800ccc3a:
  Delete: Build-tools/Bootstrap
BitKeeper/deleted/.del-Do-pkg~5079e47cde0baad8:
  Delete: Build-tools/Do-pkg
BitKeeper/deleted/.del-logger.pm~9234101b5b668373:
  Delete: Build-tools/logger.pm
BitKeeper/deleted/.del-Do-rpm~c0ef3ebafbf53117:
  Delete: Build-tools/Do-rpm
BitKeeper/deleted/.del-cvs-sanity-check~a3c58acf37f27cee:
  Delete: Build-tools/cvs-sanity-check
BitKeeper/deleted/.del-Do-all-build-steps~bb7d38f34728ac06:
  Delete: Build-tools/Do-all-build-steps
BitKeeper/deleted/.del-Do-local-patch-file~b86e1bfa3b7c13d3:
  Delete: Build-tools/Do-local-patch-file
BitKeeper/deleted/.del-Do-linux-build~b3b941454648a285:
  Delete: Build-tools/Do-linux-build
BitKeeper/deleted/.del-Do-patch-file~a2e87df5f75fd496:
  Delete: Build-tools/Do-patch-file
BitKeeper/deleted/.del-newest~2dd91db13f2ea308:
  Delete: Build-tools/newest
BitKeeper/deleted/.del-Do-create-perl-rpms~1f946e7d8560b3d0:
  Delete: Build-tools/Do-create-perl-rpms
BitKeeper/deleted/.del-Do-win-build~cb5c5e1df8b3de6:
  Delete: Build-tools/Do-win-build
BitKeeper/deleted/.del-my_md5sum~4680250631e4fd9:
  Delete: Build-tools/my_md5sum
BitKeeper/deleted/.del-Do-compile~d1a6d7e535befea3:
  Delete: Build-tools/Do-compile
BitKeeper/deleted/.del-mysql-copyright~56fc330ae63cfe03:
  Delete: Build-tools/mysql-copyright
BitKeeper/deleted/.del-mysql-copyright-2~e73ec01547206fec:
  Delete: Build-tools/mysql-copyright-2
2005-04-13 19:05:31 +02:00
unknown
7fbe82d24a - bumped up version number to 4.1.12 (4.1.11 has been released already) 2005-04-13 19:05:05 +02:00
unknown
a7fae731d8 More changes to reflect the removal of manual.texi from the sources:
- 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
2005-04-13 18:29:23 +02:00
unknown
26d7574462 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-13 18:28:34 +02:00
unknown
338df0b77c Fix ctype_ucs_binlog test when ucs2 not available
mysql-test/t/ctype_ucs_binlog.test:
  Require ucs support
2005-04-13 09:02:12 -07:00
unknown
9983cb598f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-13 18:00:14 +02:00
unknown
3caaded39c Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-04-13 17:53:35 +02:00