Commit graph

22166 commits

Author SHA1 Message Date
serg@serg.mylan
4757803662 merged 2005-04-14 21:31:22 +02:00
heikki@hundin.mysql.fi
a1f7f57be9 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
serg@serg.mylan
533e0551f2 TRUNCATE is always a transaction on itself. pretent we're in auto-commit mode
bug#8151
2005-04-14 18:14:54 +02:00
pem@mysql.com
e461c7969b Merge 2005-04-14 16:10:18 +02:00
pem@mysql.comhem.se
6aad6835c6 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.
2005-04-14 14:52:35 +02:00
lenz@mysql.com
e914d9afef 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
lenz@mysql.com
3dbbb2fc47 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
lenz@mysql.com
2e7a809b50 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
lenz@mysql.com
3ae0fc3426 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
pekka@mysql.com
dd3963448a 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
lenz@mysql.com
259c416056 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
ramil@mysql.com
9f440d2b20 Merge mysql.com:/usr/home/ram/work/mysql-4.1
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-04-14 16:39:42 +05:00
ramil@mysql.com
a835045b8f Merge mysql.com:/usr/home/ram/work/mysql-4.0
into mysql.com:/usr/home/ram/work/mysql-4.1
2005-04-14 16:26:39 +05:00
msvensson@neptunus.(none)
f1496eb6f7 BUG#9455 mysqladmin status crash the server
- Send error to client when mysql_change_db fails.
2005-04-14 11:56:13 +02:00
lenz@mysql.com
5e4b53cf9d 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
lenz@mysql.com
ba785a5814 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
ramil@mysql.com
1dc796a12e 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
ramil@mysql.com
b2dbaea394 Bit type: fix for create_field::create_field(). 2005-04-14 14:32:25 +05:00
mleich@mysql.com
7880393b39 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
lenz@mysql.com
19b2a04f6d 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
lenz@mysql.com
7ef6152116 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
heikki@hundin.mysql.fi
7731e5f4cf 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
heikki@hundin.mysql.fi
d8c1661d61 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-04-14 10:56:29 +03:00
ramil@mysql.com
c7a6c8de06 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
igor@rurik.mysql.com
c9ad5e7673 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
igor@rurik.mysql.com
b622aba19f information_schema.result, information_schema.test:
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.
2005-04-13 23:06:37 -07:00
pekka@mysql.com
768b1da09b 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
jimw@mysql.com
6632ed5ce7 Check that the default storage engine is really available, and
refuse to start up if it is not. (Bug #9815)
2005-04-13 18:25:31 -07:00
jimw@mysql.com
47ab7c8785 Don't allow the server to start up when an invalid user is
specified via --user or in configuration. (Bug #9833)
2005-04-13 15:43:29 -07:00
petr@mysql.com
da9a6aecad Merge mysql.com:/home/cps/mysql/trees/mysql-4.1
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-04-14 01:57:52 +04:00
petr@mysql.com
75cfee68fb post review fix 2005-04-14 01:39:24 +04:00
jimw@mysql.com
f7d89dd468 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
konstantin@mysql.com
ced4317774 Allow SQLCOM_CALL in prepared mode. 2005-04-13 12:36:15 -07:00
heikki@hundin.mysql.fi
eee5727b5e Merge 2005-04-13 21:24:49 +03:00
lenz@mysql.com
a88acf4a9f 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
lenz@mysql.com
8682afdf36 Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0-build
2005-04-13 19:56:38 +02:00
lenz@mysql.com
c4fb796e9e Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build
2005-04-13 19:51:55 +02:00
lenz@mysql.com
c8225b62fd - fixed a date for a changelog entry in the RPM spec file (s/Mar/Apr/) - RPM complains about wrongly
ordered entries.
2005-04-13 19:50:54 +02:00
lenz@mysql.com
1bd8c68f7f - After merge fixes 2005-04-13 19:46:26 +02:00
jimw@mysql.com
62b78d4182 Merge from 4.1 2005-04-13 10:38:11 -07:00
heikki@hundin.mysql.fi
b698b8620e 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
2005-04-13 20:21:28 +03:00
lenz@mysql.com
1fa6725145 - removed more build tools that are now maintained seperately 2005-04-13 19:18:22 +02:00
lenz@mysql.com
fa41ce0924 Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build
2005-04-13 19:07:06 +02:00
lenz@mysql.com
ff90e42f57 - Cleanup: removed obsolete build tools (build toolchain is now maintained sepearately) 2005-04-13 19:05:31 +02:00
lenz@mysql.com
ba89d0fd8f - bumped up version number to 4.1.12 (4.1.11 has been released already) 2005-04-13 19:05:05 +02:00
lenz@mysql.com
077368fc28 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.
2005-04-13 18:29:23 +02:00
mskold@mysql.com
6f34bc3b41 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
jimw@mysql.com
0162702290 Fix ctype_ucs_binlog test when ucs2 not available 2005-04-13 09:02:12 -07:00
mskold@mysql.com
ba1cde5c64 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
pem@mysql.com
2be7a2b92e 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