Commit graph

22076 commits

Author SHA1 Message Date
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
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
pem@mysql.comhem.se
7a4f495f5b Fixed BUG#9674: Stored Procs: Using declared vars in algebric operation
causes system crash.
2005-04-13 17:43:53 +02:00
mskold@mysql.com
9626f021c6 Merge 2005-04-13 17:30:12 +02:00
pem@mysql.comhem.se
387afb3d29 Fixed BUG#9856: Stored procedures: crash if handler for sqlexception, not found. 2005-04-13 16:57:49 +02:00
mskold@mysql.com
add3fd3cca Merge 2005-04-13 16:24:17 +02: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
pem@mysql.comhem.se
6a46d0cd8a Added test case for BUG#6129: Stored procedure won't display @@sql_mode value. 2005-04-13 16:09:28 +02:00
heikki@hundin.mysql.fi
9cfa9b91f8 row0sel.c:
Fix the patch of Jan to optimize next-key locking in searches of type 'primary key >= some value'
2005-04-13 16:49:28 +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
2ed9965b14 Fixed failed merge 2005-04-13 13:17:39 +02:00
mskold@mysql.com
ec0396fe98 Merge 2005-04-13 12:49:10 +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
msvensson@neptunus.(none)
3416e42903 BUG#9391 mysqlshow prints incorrect "rows" information
- Removed use of mysql->extra_info
 - Removed unused function send_records_num
2005-04-13 12:22:20 +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
jan@hundin.mysql.fi
76a15f8435 Fixed a bug where next-key locking doesn't allow the insert which does
not produce phantom (bug #9354).
2005-04-13 12:07:16 +03:00
jimw@mysql.com
3dcfc31e76 Remove references to result.es files 2005-04-12 18:04:32 -07:00
serg@serg.mylan
32221d9b9e Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-12 23:12:26 +02:00
serg@serg.mylan
b3e54c9aee mysql-test/r/flush_block_commit.result
correct result after bugfix
sql/sql_class.cc
    initialize net.query_cache_query
2005-04-12 23:08:19 +02:00
ramil@mysql.com
f93ebc20ac Bit type: code clean-up. 2005-04-12 23:12:00 +05:00
pem@mysql.com
24d4264d02 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-04-12 18:13:29 +02:00
serg@serg.mylan
3ab03ccbb0 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-12 17:22:14 +02:00
serg@serg.mylan
d4a0becc8a FLUSH TABLES WITH READ LOCK should block writes to binlog too 2005-04-12 17:15:54 +02:00
msvensson@neptunus.(none)
8cf7979e0f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-12 17:11:45 +02:00
ramil@mysql.com
eae4d9c073 Bit type: code cleanup. 2005-04-12 19:36:21 +05:00
pem@mysql.comhem.se
9c21006f81 Fixed BUG#7185: Stored procedure crash if identifier is AVG 2005-04-12 15:43:24 +02:00
marko@hundin.mysql.fi
d5646eb6c5 InnoDB: Ignore character set mismatch in ALTER TABLE and RENAME TABLE
if foreign_key_checks=0. (Bug #9802)
2005-04-12 16:12:34 +03:00
pem@mysql.comhem.se
e0e281ecb8 Fixed BUG#6663: Stored Procedures code report non-selected DB
when CREATE but not when ALTER
2005-04-12 14:52:54 +02:00
msvensson@neptunus.(none)
a1c4918a6c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-12 14:51:03 +02:00
joreland@mysql.com
b38a5171a6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-04-12 13:56:58 +02:00
joreland@mysql.com
2e1e670b57 bug#9757 - ndb - post review
use DBUG_RETURN
2005-04-12 13:56:24 +02:00
georg@lmy002.wdf.sap.corp
480063e077 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
2005-04-12 13:42:40 +02:00
joreland@mysql.com
8f0f041e64 bug#9757 - ndb
Impl. stupid mgm lock against shutting down 2 nodes simultaniously
  Add some more dump
2005-04-12 13:36:43 +02:00
msvensson@neptunus.(none)
7387030e67 BUG#8924 'Explain' shows different strategy
- If number of records in table is 4, the calculated cost for using "index" and "range" become so close so that any rounding errors becomes visible.
 - Added one more record to the tables for heap test and expoect "range" to be selected
 - Decrease number of records in t1 for range and expect "index" to be choosen.
2005-04-12 12:04:43 +02:00