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

32313 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@shellback.(none)
557a8f50b8 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 16:52:52 +02:00
msvensson@shellback.(none)
fb89352b47 Merge msvensson.mysql.internal:mysql/my50-m-bug16576 
into  shellback.(none):/home/msvensson/mysql/work/my50-work
 2006-09-15 16:52:08 +02:00
msvensson@shellback.(none)
223c82fde2 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 16:50:08 +02:00
msvensson@shellback.(none)
a297c29243 Merge msvensson.mysql.internal:mysql/my50-m-bug21222 
into  shellback.(none):/home/msvensson/mysql/work/my50-work
 2006-09-15 16:49:24 +02:00
msvensson@shellback.(none)
2c3015499d Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 16:42:27 +02:00
hartmut@mysql.com/linux.site
4e65deb2fa Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/hartmut/projects/mysql/dev/teamtrees/mysql-5.0-maint
 2006-09-15 16:38:18 +02:00
hartmut@mysql.com/linux.site
871eeadc94 Add SSL specific linker flags to --libmysqld-libs (Bug #21239) 2006-09-15 16:35:50 +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
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)
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)
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
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
lars/lthalmann@mysql.com/dl145k.mysql.com
dd410b3f77 Merge fixes, added printout to result file 2006-09-15 03:02:01 +02: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
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@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
evgen@sunlight.local
058d22967f type_date.result: 
Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN
  Corrected a test case after removal of fix for bug#16377
query_cache.result, func_time.test, view.result, view.test, func_time.result:
  Corrected a test case after removal of fix for bug#16377
type_date.test:
  Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN
   Corrected a test case after removal of fix for bug#16377
item_cmpfunc.cc:
  Removed changes to the Item_func_between::fix_length_and_dec() made in the fix for bug#16377
 2006-09-15 02:18:30 +04: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
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
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
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
ebf4d199df Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my50-bug21618 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-14 09:21:09 -04:00
msvensson@neptunus.(none)
fd15a84c55 Merge neptunus.(none):/home/msvensson/mysql/my50-netware-mtr 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-14 11:01:23 +02:00
iggy@rolltop.ignatz42.dyndns.org
e9ff111d1e Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-09-13 14:18:36 -04:00
iggy@rolltop.ignatz42.dyndns.org
1cae186141 These bitKeeper changes will allow Windows to be used as a primary development platform. 2006-09-13 14:15:22 -04:00
kaa@polly.local
3d2c573833 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
 2006-09-13 20:31:05 +04:00
cmiller@zippy.cornsilk.net
94382c313a Bug #21618: NULL shown as empty string in client 
The column's NOT NULL flag doesn't affect what we should print.  Remove the
wrong logic that does check it.

Also, verify that this and the previous two tests print the same data as 
other output formats.
 2006-09-13 11:41:41 -04:00
kaa@polly.local
b9811a6df1 Fixed the faulty merge 2006-09-13 19:32:21 +04:00
cmiller@zippy.cornsilk.net
37eaf5cce8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-13 09:38:50 -04:00
cmiller@zippy.cornsilk.net
a724e20c74 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0--windows-vio-uninit 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-13 09:37:38 -04:00
cmiller@maint1.mysql.com
459f9fdc6d Merge maint1.mysql.com:/data/localhome/cmiller/bug15583/my50-bug15583 
into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint
 2006-09-13 15:07:06 +02:00
timour/timka@lamia.home
c8ebf3761e Merge lamia.home:/home/timka/mysql/src/5.0-bug-21774-sm 
into  lamia.home:/home/timka/mysql/src/5.0-dbg
 2006-09-13 15:24:06 +03:00
kaa@polly.local
cccc3da13a Merge polly.local:/tmp/20924/bug20294/my50-bug20294 
into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
 2006-09-13 16:06:59 +04:00
kaa@polly.local
e812ae873d Merge polly.local:/tmp/20924/bug20294/my41-bug20294 
into  polly.local:/tmp/20924/bug20294/my50-bug20294
 2006-09-13 15:18:14 +04:00
kaa@polly.local
397f0df9ad Cset exclude: kaa@polly.local|ChangeSet|20060912122540|09861 
Cset exclude: kaa@polly.local|ChangeSet|20060908100829|09983
 2006-09-13 14:41:28 +04:00