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
ramil@mysql.com
3b1c3d8c68
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.bit_class
2005-04-12 12:30:09 +05:00
ramil@mysql.com
c4376b2bc6
Bit type support for non-MyISAM tables.
2005-04-12 12:27:43 +05:00
georg@lmy002.wdf.sap.corp
1cbe701d78
Fix for verification tests: loss of decimal places should not
...
return an error
2005-04-12 08:51:26 +02:00
serg@serg.mylan
98601055b6
backport kill.test fix from 5.0
2005-04-11 22:36:07 +02:00
serg@serg.mylan
be1bbf940b
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-11 20:49:19 +02:00
serg@serg.mylan
0294339b9c
don't check record's checksum in REPAIR
2005-04-11 20:04:50 +02:00
gbichot@quadita2.mysql.com
2b7ec71836
all-local instead of all (to not have double "all:" in Makefile)
2005-04-11 17:44:28 +02:00
gbichot@quadita2.mysql.com
f356fb08d6
In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end
...
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile) (thx Serg).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile (thx Konstantin).
2005-04-11 17:37:49 +02:00
gbichot@quadita2.mysql.com
e0831dce7a
merge from 4.1
2005-04-11 16:59:06 +02:00
gbichot@quadita2.mysql.com
e42312c05d
Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
2005-04-11 16:47:39 +02:00
gbichot@quadita2.mysql.com
c7c928f168
Fix for BUG#9149 "OPTIMIZE TABLE statement on InnoDB table is logged twice in the binary log"
...
if we fall back to mysql_alter_table() (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
is not supposed to do any binlogging (it is done by the caller).
2005-04-11 16:46:03 +02:00
reggie@mdk10.(none)
4bb4a285ab
Merge mdk10.(none):/home/reggie/bk/mysql-4.1
...
into mdk10.(none):/home/reggie/bk/mysql-5.0
2005-04-11 09:29:49 -05:00