mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
30959 commits 2793 branches 343 tags 1.7 GiB
Commit graph

30959 commits

This branch
This branch
All branches
Author SHA1 Message Date
joerg@mysql.com
34d5c36c2b Manual transfer of the following changeset into the 5.0.23 release clone: 
1.2525 06/06/30 18:29:27 monty@mysql.com +3 -0
   Reverted wrong bug fix (Bug#11228)
 2006-06-30 19:37:11 +02:00
knielsen@mysql.com
af48a16ce3 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  mysql.com:/usr/local/mysql/mysql-5.0-release
 2006-06-30 09:28:06 +02:00
knielsen@mysql.com
1d56a9720c BUG#20769: Dangling pointer in ctype_recoding test case. 
In some functions dealing with strings and character sets, the wrong
pointers were saved for restoration in THD::rollback_item_tree_changes().
This could potentially cause random corruption or crashes.

Fixed by passing the original Item ** locations, not local stack copies.

Also remove unnecessary use of default arguments.
 2006-06-30 09:26:36 +02:00
kent@mysql.com
593b359d92 mysql.spec.sh: 
Disable old RPM strip
my_global.h:
  Fixed wrong cast, which caused problems with gcc 4.0 and
  floats in prepared statements (Bug #19694)
mysqlmanager.vcproj:
  Place output files in common release/debug directory
 2006-06-30 02:49:28 +02:00
joerg@mysql.com
6f6b966d16 Test "federated" failed because the log contains fixed port numbers. 
Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT".
 2006-06-29 17:00:48 +02:00
lars@mysql.com
f24851ee71 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.0-release
 2006-06-29 15:15:21 +02:00
konstantin@mysql.com
5154bc6c47 A post-merge fix. 2006-06-29 16:31:08 +04:00
lars@mysql.com
0707d4753f Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.0-release
 2006-06-29 14:03:41 +02:00
konstantin@mysql.com
06c2f1a2aa Merge mysql.com:/opt/local/work/mysql-5.0-release 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-06-29 15:25:03 +04:00
jonas@perch.ndb.mysql.com
c6d9b5c551 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-release
 2006-06-29 13:25:02 +02:00
tomas@poseidon.ndb.mysql.com
48de09a4dd Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-29 13:25:01 +02:00
tomas@poseidon.ndb.mysql.com
6df1090e80 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-29 13:03:09 +02:00
tomas@poseidon.ndb.mysql.com
0822e24679 fixed too small requestInfo in signal 
+ adopted signal to be as close as possible to 5.1...
 2006-06-29 13:01:54 +02:00
jonas@perch.ndb.mysql.com
f9822e7f6d ndb - build 
Fix compile error for forte
 2006-06-29 11:39:07 +02:00
konstantin@mysql.com
55d148c5c2 A fix for Bug#19022 "Memory bug when switching db during trigger execution". 
No test case as the bug is in an existing test case (rpl_trigger.test
when it is run under valgrind).
The warning was caused by memory corruption in replication slave: thd->db
was pointing at a stack address that was previously used by 
sp_head::execute()::old_db. This happened because mysql_change_db
behaved differently in replication slave and did not make a copy of the 
argument to assign to thd->db. 
The solution is to always free the old value of thd->db and allocate a new
copy, regardless whether we're running in a replication slave or not.
 2006-06-28 23:47:45 +04:00
patg@govinda.patg.net
18d264a1ea BUG #19773 
Pushbuild fixes to result file, test, and header file for federated.
 2006-06-28 12:18:21 -07:00
jimw@mysql.com
9bcb24b65e Merge bk-internal:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/jimw/my/mysql-5.0-18005
 2006-06-28 10:55:27 -07:00
patg@govinda.patg.net
87e88fe76b Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.0-engines-bug19773
 2006-06-28 10:11:43 -07:00
acurtis@xiphis.org
f242546e85 Merge xiphis.org:/home/antony/work2/p4-bug12096.2 
into  xiphis.org:/home/antony/work2/p4-bug12096.2-merge
 2006-06-28 09:54:40 -07:00
lars@mysql.com
6036c30b57 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-06-28 16:18:57 +02:00
knielsen@mysql.com
10abc3e244 BUG#20739. 
In the Windows build files, the "Max nt" configuration for some reason
had the mysql_client_test project disabled. Enable it.
 2006-06-28 15:15:49 +02:00
lars@mysql.com
38501d8804 Disabled test case for Windows (BUG#20753) 2006-06-28 15:07:41 +02:00
knielsen@mysql.com
e8df7d43a5 BUG#20739 
Improved definition of mysys configuration for -nt builds.
 2006-06-28 14:25:17 +02:00
tnurnberg@mysql.com
69820afce0 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/tnurnberg/mysql-5.0
 2006-06-28 13:37:13 +02:00
tnurnberg@mysql.com
a956e9d638 Merge mysql.com:/home/tnurnberg/work/mysql-5.0-maint-19857 
into  mysql.com:/home/tnurnberg/mysql-5.0
 2006-06-28 12:43:04 +02:00
tnurnberg@mysql.com
763752ef2e Bug#19857: When a user with CREATE ROUTINE priv creates a routine it results in NULL p/w 
sp_grant_privileges(), the function that GRANTs EXECUTE + ALTER privs on a SP,
did so creating a user-entry with not password; mysql_routine_grant() would then
write that "change" to the user-table.
 2006-06-28 12:40:17 +02:00
knielsen@mysql.com
529a2d1291 BUG#20739: __NT__ not probably defined for mysys project. 
Make sure for the mysys project that __NT__ is defined in *nt solution
configurations (but not in other configurations).
 2006-06-28 12:30:14 +02:00
aivanov@mysql.com
c18a4e36f4 Adding __NT__ to Max Win32 configuration. 2006-06-28 14:30:13 +04:00
gluh@mysql.com
e5dbc49bb0 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Merge/5.0-kt
 2006-06-28 14:23:33 +05:00
patg@govinda.patg.net
d2df283b78 BUG #19773 
Final-review fixes per Monty, pre-push. OK'd for 
push. Please see each file's comments.
 2006-06-27 23:49:48 -07:00
aivanov@mysql.com
0a9c238993 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/alexi/bugs/mysql-5.0-19208
 2006-06-28 10:24:10 +04:00
aivanov@mysql.com
7dc30c68f4 Fixing BUG#17719 "Delete of binlog files fails on Windows" 
and BUG#19208 "Test 'rpl000017' hangs on Windows".
 Both bugs are caused by attempting to delete an opened
 file and to create immediatedly a new one with the same
 name. On Windows it can be supported only on NT-platforms
 (by using FILE_SHARE_DELETE mode and with renaming the
 file before deletion). Because deleting not-closed files
 is not supported on all platforms (e.g. Win 98|ME) this
 is to be considered harmful and should be eliminated by
 a "code redesign".
 2006-06-28 10:21:01 +04:00
tomas@poseidon.ndb.mysql.com
2ac82c1637 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-28 02:43:38 +02:00
jimw@mysql.com
5d2c0de578 Bug #18005: Creating a trigger on mysql.event leads to server crash on scheduler startup 
Bug #18361: Triggers on mysql.user table cause server crash

 Because they do not work, we do not allow creating triggers on tables
 within the 'mysql' schema.

 (They may be made to work and re-enabled at some later date, but not
 in 5.0 or 5.1.)
 2006-06-27 17:16:02 -07:00
joerg@mysql.com
d6038ede17 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/autopush20216-5.0
 2006-06-27 22:45:21 +02:00
tomas@poseidon.ndb.mysql.com
76d1307de3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-27 21:44:10 +02:00
joerg@mysql.com
0320bae069 Manual merge for bug#20216. 2006-06-27 20:32:08 +02:00
joerg@mysql.com
44653eed3b Revert all previous attempts to call "mysql_upgrade" during RPM upgrade. 
This finishes bug#18516, as far as "generic RPMs" are concerned.
 2006-06-27 20:18:03 +02:00
joerg@mysql.com
3300c79b07 Merge mysql.com:/M50/bug19353-5.0-2 into mysql.com:/M50/bug20216-5.0 2006-06-27 20:04:44 +02:00
kroki@mysql.com
73eb784b67 Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug17203
 2006-06-27 21:31:26 +04:00
kroki@mysql.com
08f192f81b Bug#17203: "sql_no_cache sql_cache" in views created from prepared statement 
The problem was that we restored SQL_CACHE, SQL_NO_CACHE flags in SELECT
statement from internal structures based on value set later at runtime, not
the original value set by the user.

The solution is to remember that original value.
 2006-06-27 21:28:32 +04:00
joerg@mysql.com
f789b87a1b Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216), 
manual merge from 4.0.
 2006-06-27 18:36:41 +02:00
joerg@mysql.com
46ee3ac19d Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216). 2006-06-27 18:17:53 +02:00
konstantin@mysql.com
e29ea3f2ef Fix yet another place that used uint32 instead of uint. 2006-06-27 17:34:14 +04:00
tomas@poseidon.ndb.mysql.com
6283d8fd5a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-27 14:56:20 +02:00
holyfoot@deer.(none)
475911d178 merging fix 2006-06-27 17:00:24 +05:00
konstantin@mysql.com
36fdaa7d16 Fix yet another place with an obsolete explicit cast to byte *. 2006-06-27 15:39:43 +04:00
konstantin@mysql.com
3cf181bb64 Fix compilation failures on Windows caused by the patch for Bug#17199. 
Fix a minor issue with Bug#16206 (bdb.test failed if the tree is compiled 
without blackhole).
 2006-06-27 14:56:24 +04:00
tomas@poseidon.ndb.mysql.com
18e008a1ba Bug #19852 Restoring backup made from cluster with full data memory fails 
- correction of previous patch
 2006-06-27 11:26:00 +02:00
tomas@poseidon.ndb.mysql.com
95447f9d1a Bug #19852 Restoring backup made from cluster with full data memory fails 
- make sure to allocate just enough pages in the fragments by using the actual
  row count from the backup, to avoid over allocation of pages to fragments, and
  thus avoid the bug
 2006-06-27 10:02:58 +02:00