mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
49452 commits 2781 branches 343 tags 1.6 GiB
Commit graph

49452 commits

This branch
This branch
All branches
Author SHA1 Message Date
tsmith@ramayana.hindu.god
c87236ce91 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-27 18:20:54 -06:00
baker@bk-internal.mysql.com
25c467bf6f Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-08-27 20:20:08 +02:00
msvensson@pilot.(none)
ffc67d70ce Bug#28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE 
- Set sql_mode to default when creating system tables
 2007-08-27 13:39:34 +02:00
msvensson@pilot.(none)
9d1570302b Cset exclude: msvensson@pilot.(none)|ChangeSet|20070827092310|49459 2007-08-27 13:16:39 +02:00
df@pippilotta.erinye.com
0c66cf7bbc 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-08-27 11:40:38 +02:00
df@pippilotta.erinye.com
0670af9479 adjust version number 2007-08-27 11:38:32 +02:00
msvensson@pilot.(none)
bc49f3b652 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-27 11:32:34 +02:00
msvensson@pilot.(none)
f9c245611e Bug#29805 mysql_upgrade test fail if ~/.my.cnf contain a password 
- "mysql" and "mysqlcheck" should not read defaults file
 2007-08-27 11:31:49 +02:00
msvensson@pilot.(none)
e6b50eb51b Bug#30487 mysql_upgrade reports misleading errors 
- Update result file to include these "misleading errors", better to 
run mysql_upgrade with them than not at all.
 2007-08-27 11:27:03 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
ba419bdc8c Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
 2007-08-27 11:24:54 +02:00
msvensson@pilot.(none)
f5489f67e9 Bug#30029 mysql_upgrade fails for 5.0 -> 5.1.21, 5.1.20 -> 5.1.21 upgrades 
- Change to use '' to quote a string inside another string
 2007-08-27 11:23:10 +02:00
msvensson@pilot.(none)
def81f98e7 Bug#28560 mysql_upgrade test links /usr/local/mysql/lib libraries 
- Remove disabling of mysql_upgrade
 2007-08-27 11:20:31 +02:00
msvensson@pilot.(none)
0b27b3bc0e Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-27 10:50:44 +02:00
msvensson@pilot.(none)
a91bd85215 Bug#28560 mysql_upgrade test links /usr/local/mysql/lib libraries 
- Chop off .libs/ part of path if running in non installed builddir
   using libtool
 2007-08-27 10:25:34 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
b82525ecfa Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-08-25 12:33:23 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
b7231ad5d9 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-08-25 12:08:18 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
516cafdc79 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel
 2007-08-25 11:39:56 +03:00
joerg@trift2.
b30fbfd3ca Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 23:47:31 +02:00
joerg@trift2.
d7c1a81136 Merge trift2.:/MySQL/M50/netware2-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-24 23:40:36 +02:00
joerg@trift2.
ae77f187f5 Merge trift2.:/MySQL/M51/netware2-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 23:29:19 +02:00
joerg@trift2.
4d375e46e3 Merge trift2.:/MySQL/M50/netware2-5.0 
into  trift2.:/MySQL/M51/netware2-5.1
 2007-08-24 23:12:19 +02:00
joerg@trift2.
2fd45aaee6 Fixes for the NetWare builds, discovered during 5.1.21-beta and backported to 5.0: 
1) Ensure "init_db.sql" and "test_db-sql" really get built.

2) Ensure the "*.def" files with NetWare linker options get distributed to the proper directories.
 2007-08-24 23:07:59 +02:00
msvensson@pilot.(none)
89780a84c8 Remove unsued variable $glob_hostname, unused functions 
'mtr_short_hostname' and 'mtr_full_hostname'
 2007-08-24 15:43:45 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
76835dbaae Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-08-24 15:26:48 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
b25dacbdee Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-08-24 15:25:02 +03:00
dfischer/mysqldev@production.mysql.com
81528c1a00 Merge bk-internal:/home/bk/mysql-5.0-build 
into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
 2007-08-24 13:47:11 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
b356018839 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel
 2007-08-24 14:43:33 +03:00
dfischer/mysqldev@mysql.com/production.mysql.com
74afbb4b7b Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
 2007-08-24 13:30:16 +02:00
msvensson@pilot.(none)
00e1c89fec Merge pilot.(none):/data/msvensson/mysql/bug30593/my51-bug30593 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-24 13:11:32 +02:00
msvensson@pilot.(none)
643ce3979f Merge pilot.(none):/data/msvensson/mysql/bug30593/my50-bug30593 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-24 13:11:14 +02:00
msvensson@pilot.(none)
52e60422e0 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-24 13:10:53 +02:00
msvensson@pilot.(none)
4fcea0fc5c Remove unecessary use of "Socket" 2007-08-24 13:10:34 +02:00
joerg@trift2.
9e33d39aeb Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 13:03:22 +02:00
joerg@trift2.
08d0b2ba9b Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 12:41:09 +02:00
joerg@trift2.
c5b1ad99e4 Merge trift2.:/MySQL/M51/target-5.1.22 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 12:38:26 +02:00
joerg@trift2.
e8aa23fae4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-24 12:34:45 +02:00
joerg@trift2.
268ce5eb7e Merge trift2.:/MySQL/M51/tmp-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 12:28:47 +02:00
joerg@trift2.
30433c29eb Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 11:09:18 +02:00
joerg@trift2.
17c6d765a5 Merge trift2.:/MySQL/pushed/netware-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 11:02:34 +02:00
joerg@trift2.
76a05d26d5 Merge trift2.:/MySQL/pushed/netware-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-24 10:58:14 +02:00
joerg@trift2.
e9b971610f Merge trift2.:/MySQL/pushed/netware-5.0 
into  trift2.:/MySQL/pushed/netware-5.1
 2007-08-24 10:50:11 +02:00
joerg@trift2.
aa588114a2 NetWare packages were missing the scripts to initialize the database: add them. 2007-08-24 10:47:13 +02:00
df@pippilotta.erinye.com
66158ad912 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-08-24 10:14:08 +02:00
df@pippilotta.erinye.com
6d068a5ac7 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-08-24 10:13:03 +02:00
df@pippilotta.erinye.com
30435b43f2 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-08-24 09:55:47 +02:00
holyfoot/hf@hfmain.(none)
c4811d67f7 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/28430/my51-28430
 2007-08-24 07:51:58 +05:00
gshchepa@bk-internal.mysql.com
64bcb0daaf Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-08-23 23:27:30 +02:00
msvensson@pilot.(none)
ae16a5abf8 Merge pilot.(none):/data/msvensson/mysql/bug30593/my50-bug30593 
into  pilot.(none):/data/msvensson/mysql/bug30593/my51-bug30593
 2007-08-23 22:30:57 +02:00
gshchepa@bk-internal.mysql.com
46e58466cb Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/users/gshchepa/mysql-5.1-opt
 2007-08-23 21:38:24 +02:00
gshchepa@bk-internal.mysql.com
c70dbeab8b Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/users/gshchepa/mysql-5.0-opt
 2007-08-23 21:28:33 +02:00