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

49636 commits

This branch
This branch
All branches
Author SHA1 Message Date
jperkin@production.mysql.com
fa73a68c8b Merge production.mysql.com:/usersnfs/jperkin/bk/trees/50/mysql-5.0 
into  production.mysql.com:/usersnfs/jperkin/bk/trees/51/mysql-5.1
 2007-09-07 17:30:47 +02:00
jperkin@production.mysql.com
ebb1d05402 Merge production.mysql.com:/usersnfs/jperkin/bk/tmp/bug-27520 
into  production.mysql.com:/usersnfs/jperkin/bk/trees/51/mysql-5.1
 2007-09-07 15:37:04 +02:00
joerg@trift2.
04d12fc9d6 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-09-05 09:35:02 +02:00
joerg@trift2.
04b56132a7 libmysql/libmysql.c : Correct a wrong automerge: Don't duplicate "DBUG_ENTER()". 2007-09-05 09:30:50 +02:00
joerg@trift2.
3042b5bfec Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-09-04 19:56:08 +02:00
joerg@trift2.
a751c743c0 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-09-04 19:49:42 +02:00
joerg@trift2.
7fc80ef6eb Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-09-04 19:43:44 +02:00
joerg@trift2.
1aa9d47832 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-09-04 19:41:33 +02:00
joerg@trift2.
150b9a5f20 Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-09-04 19:37:45 +02:00
df@pippilotta.erinye.com
48380a6366 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-09-04 11:39:34 +02:00
df@pippilotta.erinye.com
08337dd084 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-09-04 11:07:07 +02:00
df@pippilotta.erinye.com
c5a33802b5 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-09-04 11:06:02 +02:00
df@pippilotta.erinye.com
ab791bc13d Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-09-04 10:54:32 +02:00
df@pippilotta.erinye.com
59b504a5e3 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.48 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-09-04 10:49:54 +02:00
joerg@trift2.
83bb61d8a3 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-09-03 11:13:44 +02:00
joerg@trift2.
53303665a3 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-09-03 11:09:54 +02:00
msvensson@pilot.(none)
122f5f6cd0 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-09-01 11:43:44 +02:00
msvensson@pilot.(none)
66ae874371 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-09-01 11:42:43 +02:00
msvensson@pilot.(none)
0ccf3502ef Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-09-01 11:41:59 +02:00
msvensson@pilot.(none)
c5ea7b0641 Use eval around "rmtree" and use our own version of rmtree if it fails 2007-09-01 11:41:38 +02:00
tsmith@ramayana.hindu.god
b5c13a0f46 Correct fix for test result. 2007-08-31 10:53:51 -06:00
tsmith@ramayana.hindu.god
d70e4b0c92 Correct test result file for bug #27014 2007-08-31 05:21:12 -06:00
df@pippilotta.erinye.com
948cbc736c Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-08-31 12:29:32 +02:00
tsmith@ramayana.hindu.god
47dc161f5b Fix test results for bug #27014 2007-08-31 01:28:42 -06:00
tsmith@ramayana.hindu.god
f5fdb53a35 Bug #27014: Imperfect error/warning message for STR_TO_DATE for invalid datetime value 
Fix name of function in warning message.
 2007-08-30 23:57:39 -06:00
tsmith@ramayana.hindu.god
cefe7a3c8b Merge ramayana.hindu.god:/home/tsmith/m/bk/51-target22 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-30 14:56:24 -06:00
tsmith@ramayana.hindu.god
ebe3894004 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-30 14:54:19 -06:00
tsmith@ramayana.hindu.god
58ecaaa859 Disable rpl_ndb_2other, which has never worked on bigendian machines. 2007-08-30 14:13:05 -06:00
msvensson@pilot.(none)
45667e6429 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-30 07:25:18 +02:00
tsmith@sita.local
653f7341bb Post-merge fixes, and disable buggy test case on embedded 2007-08-29 16:58:00 -06:00
kent@kent-amd64.(none)
d39853756f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-08-30 00:07:21 +02:00
kent@kent-amd64.(none)
3978bf9946 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-08-30 00:06:29 +02:00
kent@mysql.com/kent-amd64.(none)
a7d6c46494 libmysqld/sql_tablespace.cc 
libmysqld/scheduler.cc
libmysqld/sql_connect.cc
  Deleted BitKeeper soft links not needed
 2007-08-30 00:02:53 +02:00
kent@kent-amd64.(none)
b763295354 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-08-30 00:01:51 +02:00
kent@mysql.com/kent-amd64.(none)
f3436e512f server-tools/instance-manager/sql_state.c 
server-tools/instance-manager/pack.c
server-tools/instance-manager/password.c
server-tools/instance-manager/net_serv.cc
  Deleted BitKeeper soft links not needed
 2007-08-30 00:01:02 +02:00
kent@kent-amd64.(none)
46a3913ebd Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-08-29 23:59:19 +02:00
kent@mysql.com/kent-amd64.(none)
57dd7bc875 libmysql_r/client_settings.h libmysqld/ha_blackhole.cc 
Deleted BitKeeper soft links not needed
 2007-08-29 23:58:15 +02:00
brian@piggy.tangent.org
52ae4496c5 Added ORDER BY to udf select so that results are ordered. 2007-08-29 14:36:08 -07:00
tsmith@sita.local
e32bdff6f0 Merge sita.local:/Users/tsmith/m/bk/maint/51-target22 
into  sita.local:/Users/tsmith/m/bk/maint/51
 2007-08-29 15:28:38 -06:00
kent@kent-amd64.(none)
ecbff12457 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-08-29 22:29:58 +02:00
kent@mysql.com/kent-amd64.(none)
edf772aef1 CMakeLists.txt: 
Link with library "udf_example" depends on, needed for nmake
libmysql.c:
  DBUG_ENTER need to be in declaration section
 2007-08-29 22:29:07 +02:00
kent@kent-amd64.(none)
515d654e80 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-08-29 22:24:51 +02:00
kent@mysql.com/kent-amd64.(none)
cf285315eb mysql_config.sh: 
Flag changed name in icc 10
 2007-08-29 22:24:11 +02:00
antony@pcg5ppc.xiphis.org
6969ff2481 Fix pushbuild test failures which occur on big-endian systems. 
Do not convert innodb autoincrement value to little endian when on
  big endian systems.
 2007-08-29 13:02:02 -07:00
mleich@four.local.lan
032a4a45d0 Post merge fix 2 for 
ChangeSet@1.2509, 2007-08-28
     http://lists.mysql.com/commits/33239
  Fixes for the funcs_1 datadict test bugs
  #30418 "datadict" tests (all engines) fail:
         Dependency on the host name for ordering
  #30420 "datadict" tests (all engines) fail:
         Release build has help tables loaded
  #30438 "{memory,myisam,ndb}__datadict" tests fail:
         Use "InnoDB" without checking
  #30440 "datadict" tests (all engines) fail:
         Character sets depend on
                   configuration
 2007-08-29 21:36:45 +02:00
msvensson@pilot.(none)
8efb5ab34e Merge pilot.(none):/data/msvensson/mysql/my51-m-imsuite 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-29 19:08:35 +02:00
msvensson@pilot.(none)
61dbfb3a01 Move instance manager tests to it's own suite 2007-08-29 19:02:33 +02:00
msvensson@pilot.(none)
50320790d5 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-29 17:54:40 +02:00
msvensson@pilot.(none)
b1fdece307 Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-29 17:54:16 +02:00
msvensson@pilot.(none)
ac5309cb04 Remove any old pidfile before starting mysqld to make sure that 
'mysqld_wait_started' don't return prematurely because of an old
pidfile
 2007-08-29 17:54:02 +02:00