mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45573 commits 2774 branches 343 tags 1.6 GiB
Commit graph

45573 commits

This branch
This branch
All branches
Author SHA1 Message Date
tsmith@quadxeon.mysql.com
4702afda85 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-04-19 22:53:19 +02:00
tsmith@quadxeon.mysql.com
be9c660729 innodb_mysql.test, innodb_mysql.result: 
Add test case for Bug #27210: INNODB ON DUPLICATE KEY UPDATE
 2007-04-19 22:38:12 +02:00
tsmith@quadxeon.mysql.com
c1e156b1cd Post-merge fix of innodb.result 2007-04-19 21:18:49 +02:00
msvensson@pilot.blaudden
f8e3fbc27b Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-19 18:34:47 +02:00
msvensson@pilot.blaudden
1f6021dd30 mysql_upgrade must depend on GenFixPrivs 2007-04-19 18:34:00 +02:00
msvensson@pilot.blaudden
2c95135c8d mysql_upgrade depends on GenFixPrivs 2007-04-19 18:32:55 +02:00
msvensson@pilot.blaudden
179ffb2407 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-19 17:05:18 +02:00
msvensson@pilot.blaudden
ce518d20ef Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-19 17:01:59 +02:00
msvensson@pilot.blaudden
46793b6134 Build zlib before extra since extra/comp_err uses zlib 2007-04-19 17:01:19 +02:00
msvensson@pilot.blaudden
41c41448b9 mysql_upgrade win fixes 2007-04-19 17:00:29 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f2b227dc52 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b26851/b26851.5.0
 2007-04-19 15:02:36 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
c4ee4e65df Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b26851/b26851.5.1
 2007-04-19 14:56:04 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
bc1805891c Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b22824/my50-b22824
 2007-04-19 12:32:38 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
df75e6e50e Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b26851/b26851.5.0
 2007-04-19 11:45:26 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
3a0042c757 Merge mysql.com:/home/ram/work/b26851/b26851.5.0 
into  mysql.com:/home/ram/work/b26851/b26851.5.1
 2007-04-19 11:07:19 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
570aacac45 Merge mysql.com:/home/ram/work/b22824/my50-b22824 
into  mysql.com:/home/ram/work/b22824/my51-b22824
 2007-04-19 10:42:47 +05:00
tsmith@siva.hindu.god
88a477abe9 Post-push fix of client/mysqltest.c oops. 2007-04-18 21:29:38 -06:00
tsmith@siva.hindu.god
041c8a825f Move WEXITSTATUS #define from mysqltest.c to client_priv.h, and 
include client_priv.h in mysqltest.c.  Portability fix.
 2007-04-18 20:47:55 -06:00
tsmith@siva.hindu.god
68f2cc2906 Merge siva.hindu.god:/home/tsmith/m/inno/apr18/50 
into  siva.hindu.god:/home/tsmith/m/inno/apr18/51
 2007-04-18 20:38:18 -06:00
tsmith@siva.hindu.god
5b06f8bbad Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  siva.hindu.god:/home/tsmith/m/inno/apr18/51
 2007-04-18 20:06:42 -06:00
tsmith@siva.hindu.god
e2873193c7 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  siva.hindu.god:/home/tsmith/m/inno/apr18/50
 2007-04-18 20:03:47 -06:00
tsmith@siva.hindu.god
50fe976aeb Merge siva.hindu.god:/home/tsmith/m/inno/apr18/50 
into  siva.hindu.god:/home/tsmith/m/inno/apr18/51
 2007-04-18 20:00:56 -06:00
tsmith@siva.hindu.god
cf1cf3a0d1 Applied innodb-5.1-ss1404 snapshot 
Fixes:

- Bug #26662: mysqld assertion when creating temporary (InnoDB) table on a tmpfs filesystem
  Fix by not open(2)ing with O_DIRECT but rather calling fcntl(2) to set
  this flag immediately after open(2)ing. This way an error caused by
  O_DIRECT not being supported can easily be ignored.
- Bug #23313: AUTO_INCREMENT=# not reported back for InnoDB tables
- Bug #21404: AUTO_INCREMENT value reset when Adding FKEY (or ALTER?)
  Report the current value of the AUTO_INCREMENT counter to MySQL.
 2007-04-18 19:53:28 -06:00
tsmith@siva.hindu.god
d232cead7b Apply innodb-5.0-ss1405 snapshot 
NULL MERGE: this ChangeSet will be null merged into mysql-5.1

Fixes:

- Bug #26662: mysqld assertion when creating temporary (InnoDB) table on a tmpfs filesystem
  Fix by not open(2)ing with O_DIRECT but rather calling fcntl(2) to set
  this flag immediately after open(2)ing. This way an error caused by
  O_DIRECT not being supported can easily be ignored.
- Bug #23313: AUTO_INCREMENT=# not reported back for InnoDB tables
- Bug #21404: AUTO_INCREMENT value reset when Adding FKEY (or ALTER?)
  Report the current value of the AUTO_INCREMENT counter to MySQL.
 2007-04-18 19:36:22 -06:00
mtaylor@qualinost.(none)
9625810b51 Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
 2007-04-18 14:37:01 -07:00
mtaylor@qualinost.(none)
62b976d38d Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint-debianv2 
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
 2007-04-18 14:35:15 -07:00
mtaylor@qualinost.(none)
f9d8b39bc5 Fixed make distcheck problem. 2007-04-18 14:34:38 -07:00
tsmith@siva.hindu.god
9232def96b Merge siva.hindu.god:/home/tsmith/m/bk/51 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-04-18 14:55:42 -06:00
tsmith@siva.hindu.god
39496731a2 Merge siva.hindu.god:/home/tsmith/m/bk/50 
into  siva.hindu.god:/home/tsmith/m/bk/maint/50
 2007-04-18 14:50:32 -06:00
msvensson@pilot.blaudden
77dcfdd8e7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 19:34:50 +02:00
msvensson@pilot.blaudden
50669c43ac Add CMakeLists.txt to EXTRA_DIST 2007-04-18 19:34:33 +02:00
msvensson@pilot.blaudden
91213f512c Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 19:01:01 +02:00
msvensson@pilot.blaudden
4e84ab3f82 Remove the check for value_start(if any it should be *value_start) 2007-04-18 19:00:42 +02:00
msvensson@pilot.blaudden
eeaf1fa655 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 18:40:44 +02:00
msvensson@pilot.blaudden
453b6180d0 Use my_snprintf instead of snprintf 2007-04-18 18:40:22 +02:00
msvensson@pilot.blaudden
6e6d942cb4 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-18 18:38:20 +02:00
msvensson@pilot.blaudden
905996141d Use my_snprintf instead of snprintf 2007-04-18 18:38:03 +02:00
msvensson@pilot.blaudden
00d80b5474 Add scripts/ subdiretory 2007-04-18 18:35:13 +02:00
msvensson@pilot.blaudden
f6240e374d Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 17:00:43 +02:00
msvensson@pilot.blaudden
dc66c88bba Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 16:57:40 +02:00
msvensson@pilot.blaudden
4ca2b73f24 Use mysqltest builtin $MYSQL_SERVER_VERSIOn to mask version that mysql_upgrade reports 2007-04-18 16:56:53 +02:00
msvensson@pilot.blaudden
a8a8c8c181 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-18 16:56:32 +02:00
msvensson@pilot.blaudden
e9a9107f4f Add mysql builtin $MYSQL_SERVER_VERSION and some function to make 
it easier to set a variable from string or int
 2007-04-18 16:56:17 +02:00
msvensson@pilot.blaudden
a4681af19c Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 16:50:14 +02:00
msvensson@pilot.blaudden
84d60374e5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-18 16:49:10 +02:00
msvensson@pilot.blaudden
76285bdf31 Update mysql_upgrade tests for 5.1 
Add "two liner" to mysqld --bootstrap that allows
wo write scripts that can be run both by mysql and mysqld --bootstrap
Remove duplicate create of MySQL system tables
 2007-04-18 16:23:19 +02:00
msvensson@pilot.blaudden
01133f8e6f Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 14:18:55 +02:00
msvensson@pilot.blaudden
a247bd582e Make it possible to define how many slaves to start by 
writing --slave-num=n in <testname>-master.opt file
 2007-04-18 13:50:54 +02:00
msvensson@pilot.blaudden
dd0d2146c3 Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-18 13:22:32 +02:00
msvensson@pilot.blaudden
20e622dcf3 Bug#25452 mysql_upgrade access denied 
- Improve mysql_upgrade and add comments describing it's logic
 - Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade
  was started from
 - Don't look for mysql_fix_privilege_tables.sql randomly, compile
  in the mysql_fix_privilege_tables.sql file and use that to upgrade
  the system tables of MySQL
 - Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL
 - Fix bug#26639, bug#24248 and bug#25405
 2007-04-18 13:21:39 +02:00