jimw@mysql.com
1cc23599c2
Cleanups to patch for bug #9660 after review by Monty.
2005-05-26 10:01:26 -07:00
bell@sanja.is.com.ua
68899decc2
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-05-26 19:32:58 +03:00
joerg@mysql.com
db8368fdd5
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/M40/mysql-4.0
2005-05-26 18:24:17 +02:00
joerg@mysql.com
55fe5aaa47
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-05-26 18:20:17 +02:00
joerg@mysql.com
5178c84bef
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-05-26 18:12:56 +02:00
bell@sanja.is.com.ua
b186d8b4f9
merge
2005-05-26 18:33:57 +03:00
joerg@mysql.com
76b25fc194
Corrected merge error in 'mysql-test/r/select.result': two test blocks inserted in wrong order.
2005-05-26 16:47:44 +02:00
msvensson@neptunus.(none)
8401cd5d79
BUG#9993 2 unexpected warnings when dropping a routine and --skip-grant-tables
...
- Dont perform automatic privilege handling for stored procedures when server is started --skip-grant-tables
- Renamed view_skip_grants to skip_grants and added test cases for this
2005-05-26 16:44:46 +02:00
bell@sanja.is.com.ua
db2ce1edf6
fixed problem with long string results of expressions in UNIONS (BUG#10025)
2005-05-26 17:30:12 +03:00
joerg@mysql.com
95edcc48af
Added a missing "make clean" to the RPM "spec" file which had caused the original 4.1.12 RPMs to be broken.
...
(bug#10674, bug#10681)
2005-05-26 15:21:01 +02:00
marko@hundin.mysql.fi
5d0bc0b482
Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
...
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-05-26 15:57:24 +03:00
marko@hundin.mysql.fi
2d5b96798f
InnoDB: Check all referencing tables in DROP DATABASE (Bug #10335 ).
2005-05-26 15:42:24 +03:00
joreland@mysql.com
a92a12d54a
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-26 14:39:16 +02:00
monty@mysql.com
3f17e9a4e3
Merge hasky:/my/mysql-build into mysql.com:/home/my/mysql-5.0
2005-05-26 15:20:27 +03:00
joreland@mysql.com
8bba533f86
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-26 14:07:31 +02:00
joreland@mysql.com
7a471f7f69
bug#10190 - ndb
...
ndb_restore invalid handling of distribution keys when restoring meta data
(also aligned printout with that of ndb_desc)
2005-05-26 14:03:26 +02:00
monty@mysql.com
206c0ebbc3
Moved detection of wrong decimal fields before decimal field was created to avoid ASSERT() for DECIMAL(1)
2005-05-26 14:00:47 +03:00
joerg@mysql.com
4572248a84
Correction of merge mishandling in 'client/client_priv.h'.
2005-05-26 12:58:55 +02:00
joerg@mysql.com
f39f049041
Merge
2005-05-26 12:55:31 +02:00
joerg@mysql.com
9504bd0ddd
Manual merge.
2005-05-26 12:51:44 +02:00
msvensson@neptunus.(none)
6c00006d2c
Fix icc compiler warning
2005-05-26 12:12:36 +02:00
msvensson@neptunus.(none)
975ca22872
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-26 12:10:05 +02:00
msvensson@neptunus.(none)
83d430353e
Add ifdefs to control when "#pragma implementation" should be used
...
Added some more ifdefs for "#pragma interface"
2005-05-26 12:09:14 +02:00
lenz@mysql.com
c58535f6d3
- merged the 4.1.12a Changes back into the main tree
2005-05-26 11:43:47 +02:00
msvensson@neptunus.(none)
676ba73480
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-26 11:37:19 +02:00
msvensson@neptunus.(none)
f3cc29e93b
Fix compiler warning
2005-05-26 11:36:01 +02:00
msvensson@neptunus.(none)
128074d91a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug9879
2005-05-26 11:25:25 +02:00
joreland@mysql.com
9e188eaeb9
ndb - Testcase for bug#10669
...
--database option to hugo tools
2005-05-26 07:21:05 +02:00
joreland@mysql.com
cdac1d9c07
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-26 06:49:07 +02:00
jimw@mysql.com
aac55df4f4
Fix table renaming to not lowercase table names for all storage
...
engines when lower_case_table_names == 2, as it did previously
for InnoDB and MEMORY. (Bug #9660 )
2005-05-25 20:26:40 -07:00
kent@mysql.com
e2955a2f13
init_db.sql:
...
Updated test data in system tables
2005-05-26 02:07:13 +02:00
kent@mysql.com
3d4a494189
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-05-26 01:38:29 +02:00
jimw@mysql.com
5905598e16
Fix MERGE tables on Microsoft Windows. This a backport of the
...
fix from the main 5.0 tree. (Bug #10687 )
2005-05-25 14:41:50 -07:00
monty@mysql.com
7daf98db15
Move function from header file to make it easier to debug
2005-05-26 00:18:24 +03:00
monty@mysql.com
dac499ce7c
Merge hasky:/my/mysql-build into mysql.com:/home/my/mysql-5.0
2005-05-25 19:55:01 +03:00
tulin@mysql.com
60d2723930
Merge mysql.com:/data0/mysqldev/my/mysql-5.0-build
...
into mysql.com:/data0/mysqldev/tomas/mysql-5.0-build
2005-05-25 18:54:47 +02:00
joerg@mysql.com
830d25d985
Manual merge.
2005-05-25 18:11:03 +02:00
tulin@mysql.com
264de67fc6
Bug #10838 CREATE TABLE produces strange DEFAULT value
2005-05-25 17:54:36 +02:00
monty@mysql.com
dab33061ff
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-05-25 18:38:29 +03:00
monty@mysql.com
cb7cd33222
Fix that we can read tables with the 'older' decimal format used in 5.0.3 & 5.0.4
...
We will however give a warning when opening such a table that users should use ALTER TABLE ... FORCE to fix
the table. In future release we will fix that REPAIR TABLE will be able to handle this case
2005-05-25 18:33:36 +03:00
monty@mysql.com
5f8f947f34
Cleanup's during review
...
Added ASSERT() to detect wrongly packed fields
2005-05-25 18:33:32 +03:00
joreland@mysql.com
5da2d48a3f
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-25 16:37:31 +02:00
joerg@mysql.com
0d121fe01a
Added a missing "make clean" to the RPM "spec" file which had caused the original 4.1.12 RPMs to be broken.
...
(bug#10674, bug#10681)
2005-05-25 16:24:07 +02:00
joreland@mysql.com
60d3e60e27
ndb - Embryo of overload protection
...
Add method to query free send buffer size
2005-05-25 16:19:17 +02:00
svoj@mysql.com
b763679f1c
WL#2286 - Compile MySQL w/YASSL support
...
Merge with latest yaSSL, fix compilation error for SSE2 processors.
2005-05-25 19:11:36 +05:00
monty@mysql.com
6d5d6c9257
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-05-25 12:57:29 +03:00
monty@mysql.com
fb90aaa7b5
Cleanup during code review
...
Faster detection of wrong table names (like PRN) on windows
2005-05-25 12:56:47 +03:00
joreland@mysql.com
5189e9dd91
ndb autotest - merge jonathans script changes
2005-05-25 11:53:58 +02:00
marko@hundin.mysql.fi
5a8cfc1541
srv0start.c:
...
innobase_shutdown_for_mysql(): Do very fast shutdown
only if srv_fast_shutdown==2, not if srv_fast_shutdown!=0
(Bug #9673 )
2005-05-25 12:41:57 +03:00
msvensson@neptunus.(none)
0ed2e57731
Use one err file for each master
2005-05-25 11:10:10 +02:00