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

38170 commits

This branch
This branch
All branches
Author SHA1 Message Date
mskold/marty@linux.site
caeb010e8c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-09-15 15:45:51 +02:00
msvensson@shellback.(none)
e03619ce63 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-15 15:45:03 +02:00
msvensson@shellback.(none)
2ce0da628e Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 15:43:46 +02:00
msvensson@shellback.(none)
faeb59cbbf Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 15:41:50 +02:00
msvensson@shellback.(none)
c3e2d543db Bug#22326 Build problems on hurd-i386: conflicting declaration of socklen_t 2006-09-15 15:41:04 +02:00
guilhem@gbichot3.local
09c5a83416 WL#3504 "plugin actions for engines' and plugins' unit tests" 
for push in 5.1 (I will inform Trudy).
Storage engines and plugins can now have unit tests to test their components; such
test must be an executable C/C++ program which name ends with '-t' and which is
obeys the mytap protocol, it must be stored in the storage engine's or plugin's
source directory (storage/<engine> or plugin/<plugin>) or any subdirectories of
this.
The top-level Makefile target "test-unit" will run all unit tests: it will scan
the engines' and plugins' directories, recursively, and execute all executable
files which name ends with '-t'."
 2006-09-15 15:15:24 +02:00
cmiller@zippy.cornsilk.net
47483245b9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-15 09:00:46 -04:00
msvensson@shellback.(none)
d4cb04fc05 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-15 14:39:55 +02:00
msvensson@shellback.(none)
9fc503e099 Merge msvensson.mysql.internal:mysql/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-15 14:36:03 +02:00
msvensson@shellback.(none)
bdc7837388 Merge msvensson.mysql.internal:mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 14:34:50 +02:00
msvensson@shellback.(none)
cebd7d9d67 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 14:31:25 +02:00
msvensson@shellback.(none)
2b79a6bc36 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-15 14:28:25 +02:00
msvensson@shellback.(none)
c4177ec484 Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown 2006-09-15 14:27:45 +02:00
gkodinov@dl145s.mysql.com
a9b3bd0eec Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-09-15 14:14:38 +02:00
istruewing@chilla.local
45f7514d03 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-bug14400
 2006-09-15 14:02:43 +02:00
gkodinov@dl145s.mysql.com
b1e087a717 Merge dl145s.mysql.com:/data/bk/team_tree_merge/CLEAN/mysql-5.0 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-09-15 11:52:49 +02:00
gkodinov@dl145s.mysql.com
148cb4e98a Merge dl145s.mysql.com:/data/bk/team_tree_merge/CLEAN/mysql-5.0 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-09-15 11:47:23 +02:00
gkodinov@dl145s.mysql.com
325f820909 Merge dl145s.mysql.com:/data/bk/team_tree_merge/CLEAN/mysql-4.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
 2006-09-15 11:43:28 +02:00
ramil/ram@myoffice.izhnet.ru
8445f3e3de Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/usr/home/ram/work/mysql-5.1-maint
 2006-09-15 14:15:09 +05:00
msvensson@shellback.(none)
a989d35221 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 11:03:55 +02:00
istruewing@chilla.local
b92f68d459 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  chilla.local:/home/mydev/mysql-5.0-bug14400
 2006-09-15 07:41:32 +02:00
dlenev@mockturtle.local
1022179878 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
 2006-09-15 09:19:35 +04:00
lars/lthalmann@mysql.com/dl145j.mysql.com
996b8d92c7 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-15 03:52:36 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
a55fbb60b9 Merge main->rpl 2006-09-15 03:15:06 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
dd410b3f77 Merge fixes, added printout to result file 2006-09-15 03:02:01 +02:00
tsmith/tim@siva.hindu.god
ee6275c503 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-09-14 18:57:36 -06:00
ted@ted.mysql.internal
5610ef3018 Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-maint 
into  ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-5.1-gca
 2006-09-15 04:32:58 +04:00
ted@ted.mysql.internal
a1e9531d29 Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-5.1-gca 
into  ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint
 2006-09-15 04:14:46 +04:00
ted@ted.mysql.internal
cb08c534a0 Bug#21011 The [client] group header was overwritten by "password" option in upgrade_defaults file which confused mysqlcheck thus used to prevent the whole thing from running correctly when the "--password=" option is specified on mysql_upgrade command line with no corresponding "--user=" option 2006-09-15 04:01:47 +04:00
lars/lthalmann@dl145j.mysql.com
a3adcfe52d Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-15 01:46:47 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
2840596e10 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-09-15 01:26:28 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
ec51f809b8 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
 2006-09-15 01:15:39 +02:00
andrey@example.com
fcb79e1bfd Fix an assert on AIX 5.2, 64bit. COND_queue_state wasn't 
initialized prior to usage as well as deinitialized on shutdown.
 2006-09-14 23:25:59 +02:00
tsmith/tim@siva.hindu.god
2c67b7cecd Post-merge fix: remove dup() call in ha_archive.cc which resulted in a memory leak. 2006-09-14 14:59:14 -06:00
iggy@rolltop.ignatz42.dyndns.org
02833f49c3 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my50-bug21424 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-09-14 16:37:22 -04:00
dlenev@mockturtle.local
5ba1b83c98 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
 2006-09-14 23:53:35 +04:00
istruewing@chilla.local
22d8c89d6e Merge chilla.local:/home/mydev/mysql-5.1--main 
into  chilla.local:/home/mydev/mysql-5.1-toteam
 2006-09-14 21:44:17 +02:00
iggy@rolltop.ignatz42.dyndns.org
453c5c5aa8 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my50-bug21424 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my51-bug21424
 2006-09-14 14:57:11 -04:00
iggy@rolltop.ignatz42.dyndns.org
4fa6c8c776 Bug#21424 mysqldump failing to export/import views. 
Dumps are created for the tables in each specified database then for the views in each specified database. This bug occurs when any database's views depend on the mysql database's table data while being restored. 
Added command line option --flush-privileges to the mysqldump utility which causes a FLUSH PRIVILIGES statement to be written to the dump after the mysql database.
 2006-09-14 14:56:14 -04:00
istruewing@chilla.local
5e7db2ad06 Merge chilla.local:/home/mydev/mysql-5.0-bug14400 
into  chilla.local:/home/mydev/mysql-5.1-bug14400
 2006-09-14 18:12:53 +02:00
istruewing@chilla.local
97b52dadf3 Merge chilla.local:/home/mydev/mysql-4.1-bug14400 
into  chilla.local:/home/mydev/mysql-5.0-bug14400
 2006-09-14 17:50:59 +02:00
iggy@rolltop.ignatz42.dyndns.org
1528d04fea Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my50-bksendmailfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-09-14 11:05:27 -04:00
iggy@rolltop.ignatz42.dyndns.org
ebcacf915b Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my51-bksendmailfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
 2006-09-14 11:04:35 -04:00
iggy@rolltop.ignatz42.dyndns.org
d7c9784682 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my50-bksendmailfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my51-bksendmailfix
 2006-09-14 11:00:38 -04:00
iggy@rolltop.ignatz42.dyndns.org
7c0c57d694 /usr/sbin not always in PATH environment variable. 2006-09-14 10:57:00 -04:00
istruewing@chilla.local
d53ac19620 Bug#14400 - Query joins wrong rows from table which is subject of 
"concurrent insert"
After merge fix.
 2006-09-14 16:55:57 +02:00
evgen@moonbone.local
5841147d4d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  moonbone.local:/work/21677-bug-4.1-opt-mysql
 2006-09-14 18:46:44 +04:00
evgen@moonbone.local
a33d1d8484 type_date.test, type_date.result: 
Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN
 2006-09-14 18:45:23 +04:00
joerg@trift-lap.fambruehe
a33fdb44e5 Include "manual.chm" in the source distribution, because we now use it for Windows builds unchanged. 2006-09-14 16:34:35 +02:00
cmiller@zippy.cornsilk.net
796452dbf5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-14 10:03:23 -04:00