Commit graph

18245 commits

Author SHA1 Message Date
jimw@mysql.com
ab939dce27 Merge mysql.com:/home/jimw/my/mysql-4.1-9833
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-15 11:52:58 -07:00
jimw@mysql.com
886b8603f4 Merge mysql.com:/home/jimw/my/mysql-4.1-9815
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-15 11:52:35 -07:00
jimw@mysql.com
77f6f5b178 Merge mysql.com:/home/jimw/my/mysql-4.1-9852
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-15 11:51:41 -07:00
ingo@mysql.com
e2cf8b309e Bug#9487 - myisampack segmentation violation and bus error
Fixed some casts for 64-bit systems.
Fixed a possible buffer overflow.
2005-04-15 19:26:38 +02:00
serg@serg.mylan
08ae28f4b8 BUG#9922 - INSERT SELECT with UNIONs allows concurrent INSERTs
don't set lex->lock_option=TL_READ in the parser for SELECT
2005-04-15 19:20:15 +02:00
ingo@mysql.com
990ebef7f6 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug9188
2005-04-15 17:16:42 +02:00
mskold@mysql.com
40a0548a1b Bug #9839 Column with AUTOINC contains -1 Value on node stop, post review fix 2005-04-15 16:14:08 +02:00
mskold@mysql.com
e889d234cb Bug #9839 Column with AUTOINC contains -1 Value on node stop 2005-04-15 15:52:07 +02:00
jimw@mysql.com
5e581186a4 Fix mysql.server.sh to use shell functions as replacement
for LSB init functions when they aren't available. (Bug #9852)
2005-04-14 17:22:18 -07:00
serg@serg.mylan
16a0a6894e Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-14 23:08:12 +02:00
serg@serg.mylan
b07b5f7a6d Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-04-14 22:09:38 +02:00
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
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
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
joreland@mysql.com
27f7a6c41b BUG#9891 - ndb lcp
Crash if ACC_CONTOPREQ was sent while ACC_LCPCONF was in job buffer
  if ACC_LCPCONF would have arrived eariler (before TUP_LCPSTARTED)
  operations could lockup. 
  But would be restarted on next LCP

-- LQH
1) Better check for LCP started that will also return true
   if ACC or TUP already has completed
    
2) Remove incorrect if statement that prevented operations to
   be started if ACC has completed

-- ACC
Make sure all ACC_CONTOPCONF are sent before releasing lcp record
  i.e. use noOfLcpConf == 4 (2 ACC_LCPCONF + 2 ACC_CONTOPCONF)

Check for == 4 also when sending ACC_CONTOPCONF
2005-04-14 13:43:07 +02: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
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
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
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
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
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
75cfee68fb post review fix 2005-04-14 01:39:24 +04: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
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
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
jimw@mysql.com
0162702290 Fix ctype_ucs_binlog test when ucs2 not available 2005-04-13 09:02:12 -07:00
jimw@mysql.com
924ecbf877 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-13 08:46:29 -07:00
heikki@hundin.mysql.fi
7cdb04b18b fil0fil.c:
At the shutdown, write the latest lsn only to the first pages of the ibdata files of the system tablespace, NOT to the .ibd files; writing to tens of thousands .ibd files can take minutes
2005-04-13 17:22:04 +03:00
heikki@hundin.mysql.fi
de42e5e1e2 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-04-13 16:19:49 +03:00
heikki@hundin.mysql.fi
aefe018b67 row0sel.c:
Do not test the value of err if the lock operation was skipped because innodb_logs_unsafe_for_binlog was TRUE; though this did not cause any bugs visible to the user, because err is inited to DB_SUCCESS at the start of the function row_search_for_mysql()
2005-04-13 15:49:28 +03:00
mskold@mysql.com
e39ba63934 Merge 2005-04-13 14:08:54 +02:00
pekka@mysql.com
3c0a885fed ndb - bug#9865 fix error message 2005-04-13 13:40:53 +02:00
lenz@mysql.com
ad75afe308 Manual merge of the ChangeSet to remove the dependency on manual.texi from the source tree (from 4.0) 2005-04-13 13:27:06 +02:00
mskold@mysql.com
f5855f2d57 Fix for bug#9813: Test 'ndb_basic': Autoincrement fails in 64 bit 2005-04-13 12:42:23 +02:00
lenz@mysql.com
11df4eec85 - manual.texi will be replaced with a manual written in DocBook/XML. This ChangeSet removes all
references to the .texi file and the build targets that depend on manual.texi as the input file.
- added COPYING as a regular file instead of creating it during the build. This ensures that it's part
  of the sources when pulling from BK (it used to be extracted from the manual)
- Removed a lot of cruft and unused/obsolete stuff from the Docs directory (e.g. Flags, Images)
- added a dummy mysql.info placeholder file (the info file is still used as the source to extract
  various text files during the build). It will be replaced with a "real" file during the Bootstrap
  process to create the official source distribution - the placeholder just satisfies build dependencies.
2005-04-13 11:51:38 +02:00
mleich@mysql.com
d1806d7870 Minor improvements + new option needed for WL#2520 Upgrade/Downgrade Test Plan 2005-04-13 11:47:28 +02:00
joreland@mysql.com
45a07db5c0 BUG#9749 - ndb lock upgrade - more fixes...
1) Make getNoParall into function instead of a procedure
2) Check for multiple transactions in "upgrade's" parallell queue
3) Set lock mode according to lock_owner's lockMode

NOTE: Does still not handle lock upgrade in case of aborts correctly
2005-04-13 09:54:40 +02:00
jimw@mysql.com
3dcfc31e76 Remove references to result.es files 2005-04-12 18:04:32 -07:00