mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
38377 commits 2784 branches 343 tags 1.6 GiB
Commit graph

38377 commits

This branch
This branch
All branches
Author SHA1 Message Date
kostja@bodhi.(none)
4c83efbb95 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-12-12 06:00:10 +03:00
df@pippilotta.erinye.com
de716f1f86 No we're still at 5.0.54. 2007-12-11 17:38:49 +01:00
thek@adventure.(none)
7be4b6b5f4 Test fails because of non deterministric function: show grants for current_user() 2007-12-10 16:16:21 +01:00
thek@adventure.(none)
0f1665da3c Merge adventure.(none):/home/thek/Development/cpp/bug27440/my50-bug27440 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
 2007-12-10 12:19:48 +01:00
df@pippilotta.erinye.com
a079cb9f49 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-release 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-12-10 12:02:02 +01:00
df@pippilotta.erinye.com
efd74cb680 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-12-10 10:52:05 +01:00
df@pippilotta.erinye.com
45c93a5866 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-12-10 10:42:58 +01:00
df@pippilotta.erinye.com
353cd3300a Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
 2007-12-10 10:41:34 +01:00
tsmith@ramayana.hindu.god
4eb097ba12 Add a way to remove options which mysql-test-run.pl no longer uses. 2007-12-07 14:43:31 -07:00
thek@adventure.(none)
392cc185b3 Bug #27440 read_only allows create and drop database 
When read_only option was enabled, a user without SUPER privilege could
perform CREATE DATABASE and DROP DATABASE operations.

This patch adds a check to make sure this isn't possible. It also attempts to 
simplify the logic used to determine if relevant tables are updated,
making it more human readable.
 2007-12-07 15:39:41 +01:00
joerg@trift2.
fd5000f650 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-12-07 13:51:41 +01:00
tsmith@ramayana.hindu.god
8c5f194505 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-12-07 03:51:23 -07:00
tsmith@ramayana.hindu.god
bf6292ea97 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-12-07 03:40:18 -07:00
tsmith@ramayana.hindu.god
6835272b37 Make tests more robust (clean up better after grant.test) 2007-12-07 03:39:37 -07:00
tsmith@ramayana.hindu.god
b922c9646c Fix compiler warning about wrong integer size (probably harmless) 2007-12-06 16:11:26 -07:00
tsmith@ramayana.hindu.god
44d74f631f ctype-simple.c: Backport quick fix to remove Windows compiler warnings 2007-12-06 15:05:24 -07:00
tsmith@ramayana.hindu.god
f1323ad628 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-12-05 15:29:37 -07:00
tsmith@ramayana.hindu.god
10cab933b2 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-12-04 20:58:21 -07:00
tsmith@ramayana.hindu.god
6453025165 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
 2007-12-04 19:16:22 -07:00
kaa@polly.(none)
0e78354baa Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-12-02 14:11:36 +03:00
kaa@polly.(none)
d905aade4f Windows-specific fixes in floating point tests. 2007-12-02 13:49:12 +03:00
kaa@polly.(none)
2a52bb82e4 Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-12-01 15:37:25 +03:00
kaa@polly.(none)
55acce7504 Fixed the floating point number tests on Windows. 2007-12-01 15:25:24 +03:00
kaa@polly.(none)
0f0051e695 Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-12-01 12:57:20 +03:00
kaa@polly.(none)
33125cd40e Fixed the build failure on Windows. It does not have trunc() defined in math.h, so we should not use it code. 2007-12-01 12:46:25 +03:00
kaa@polly.(none)
b994abb997 Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-12-01 10:48:41 +03:00
kaa@polly.(none)
7fd9135bb8 Fix for bug #26788 "mysqld (debug) aborts when inserting specific 
numbers into char fields" and bug #12860 "Difference in zero padding of
exponent between Unix and Windows"

Rewrote the code that determines what 'precision' argument should be
passed to sprintf() to fit the string representation of the input number
into the field.
We get finer control over conversion by pre-calculating the exponent, so
we are able to determine which conversion format, 'e' or 'f', will be
used by sprintf().
We also remove the leading zero from the exponent on Windows to make it
compatible with the sprintf() output on other platforms.
 2007-12-01 10:05:59 +03:00
mleich@four.local.lan
dba978a785 Merge four.local.lan:/work/trees/mysql-4.1-build-src-clean 
into  four.local.lan:/work/trees/mysql-5.0-build-src-clean
 2007-11-30 19:30:48 +01:00
mleich@four.local.lan
586a132744 Merge four.local.lan:/work/merge/mysql-5.0-dev 
into  four.local.lan:/work/trees/mysql-5.0-build-src-clean
 2007-11-30 19:27:30 +01:00
mleich@four.local.lan
ebe28cdc97 Merge four.local.lan:/work/merge/mysql-4.1-dev 
into  four.local.lan:/work/trees/mysql-4.1-build-src-clean
 2007-11-30 19:12:09 +01:00
mleich@four.local.lan
33b2d153b3 Merge four.local.lan:/work/merge/mysql-4.1-dev 
into  four.local.lan:/work/merge/mysql-5.0-dev
 2007-11-30 18:28:54 +01:00
mleich@four.local.lan
c3b8d8972f Fix for 
Bug#31030 rpl000015.test fails if $MYSQL_TCP_PORT != 3306
Note:
  This bug does not occur in MySQL 5.0 and up, because
  ChangeSet 1.2328.2.1 2006/11/27 for MySQL 5.0 prevents this.
  The 5.0 fix uses the environment variable DEFAULT_MASTER_PORT
  which is set by mysql-test-run.pl.
  mysql-test-run.pl in 4.1 does not set this variable.
  There are two alternatives:
  1) Backport the 5.0 fix for this test including modifications
     to mysql-test-run.pl and mysql-test-run-shell.
     This is a not acceptable impact on an old MySQL version.
  2) Fix the problem different than in 5.0 like in the current
     ChangeSet + do not apply these changes when upmerging to 5.0
 2007-11-30 18:06:28 +01:00
tsmith/mysqldev@mysql.com/production.mysql.com
da357f723a Bug #32219: too many hosts in default grant tables 6.0.3 
Fix is to remove any references to the current hostname when running
mysql_install_db --cross-bootstrap.  (The dist-hook make target makes
this call, and the resulting data directory is included in the source
distribution as win/data/*.)

Also, a few other clean-ups to mysql_install_db while there.
 2007-11-30 06:14:43 +01:00
kent@kent-amd64.(none)
36c5e5308a Merge mysql.com:/home/kent/bk/mac-os-x-universal/mysql-4.1-build 
into  mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.0-build
 2007-11-30 01:37:07 +01:00
kent@mysql.com/kent-amd64.(none)
666ec84bca my_global.h: 
Added 64 bit Mac OS X hard coded settings, for universal binaries
 2007-11-30 01:36:05 +01:00
kent@mysql.com/kent-amd64.(none)
611b737af3 Excluded verbose and bad change to Mac OS X universal binaries handling 2007-11-30 01:22:15 +01:00
kent@kent-amd64.(none)
c0b8aa419b Merge mysql.com:/home/kent/bk/mac-os-x-universal/mysql-4.1-build 
into  mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.0-build
 2007-11-29 23:44:16 +01:00
kent@kent-amd64.(none)
3214b7c286 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.0-build
 2007-11-29 23:42:46 +01:00
kent@mysql.com/kent-amd64.(none)
369d75dc75 my_global.h: 
Added 64 bit Mac OS X hard coded settings, for universal binaries
 2007-11-29 23:42:04 +01:00
jonathan@chorlton.adsl.perkin.org.uk
247a84d400 Shell portability fix. 2007-11-29 16:40:46 +00:00
malff@lambda.hsd1.co.comcast.net.
7c4f906bf3 Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base 
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
 2007-11-28 07:23:51 -07:00
davi@endora.local
7441f466e2 Merge mysql.com:/Users/davi/mysql/bugs/31479-5.0 
into  mysql.com:/Users/davi/mysql/mysql-5.0-runtime
 2007-11-28 10:49:30 -02:00
davi@mysql.com/endora.local
bd3f76d767 Bug#31479 Bad lock interaction if CREATE TABLE LIKE is killed 
Kill of a CREATE TABLE source_table LIKE statement waiting for a
name-lock on the source table causes a bad lock interaction.

The mysql_create_like_table() has a bug that if the connection is
killed while waiting for the name-lock on the source table, it will
jump to the wrong error path and try to unlock the source table and
LOCK_open, but both weren't locked.

The solution is to simple return when the name lock request is killed,
it's safe to do so because no lock was acquired and no cleanup is needed.

Original bug report also contains description of other problems
related to this scenario but they either already fixed in 5.1 or
will be addressed separately (see bug report for details).
 2007-11-28 10:18:01 -02:00
istruewing@stella.local
02e321d350 Bug#29149 Test "kill" fails on Windows 
Disabled test case.
 2007-11-28 09:48:06 +01:00
istruewing@stella.local
777d79f5fd Merge stella.local:/home2/mydev/mysql-5.0-ateam 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2007-11-27 18:42:59 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e2fa11fb50 after-merge fixup: archive test/result adjusted. 2007-11-27 21:30:00 +04:00
istruewing@stella.local
c389535ae9 Merge stella.local:/home2/mydev/mysql-5.0-ateam 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2007-11-27 17:34:03 +01:00
istruewing@stella.local
a167dd0bf4 Bug#8693 Test 'rpl_log_pos' fails sometimes 
Disabled the test case.
 2007-11-27 17:28:55 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
f03fb473b3 Merge mysql.com:/home/ram/work/mysql-5.0-engines 
into  mysql.com:/home/ram/work/b30495/b30495.5.0
 2007-11-27 20:03:09 +04:00
malff@lambda.hsd1.co.comcast.net.
352e59b37b Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base 
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
 2007-11-27 08:56:43 -07:00