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

38169 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
andrey@example.com
850ac2e898 Temporary fix for a deadlock. Needed so we can go with cloning 
5.1.12.
 2006-09-14 13:49:26 +02:00
mskold/marty@mysql.com/linux.site
cb3c12da2a ndb_multi.test: 
Removed replication dependency
ndb_dd_alter.test, ndb_dd_alter.result:
  Added innodb dependency and regenerated result file
ndb_dd_sql_features.result:
  Regenerated result file
 2006-09-14 12:32:49 +02: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
msvensson@neptunus.(none)
53e2342246 Merge neptunus.(none):/home/msvensson/mysql/my50-netware-mtr 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-14 10:59:49 +02:00
mskold/marty@linux.site
d038e334b4 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-09-14 09:29:20 +02:00
brian@zim.(none)
24df00f232 Merge brian@dib.tangent.org:/export/home/brian/mysql/gnu-5.1 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-13 22:09:05 -07:00
brian@dib.
5371798e82 This fixes support for building mysql on Solaris with GNU tools. 2006-09-13 22:09:04 -07:00
guilhem@gbichot3.local
cd08de06b6 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-clean
 2006-09-14 03:35:51 +02:00
aivanov/alexi@mysql.com/mysqld.localdomain
9474d3fe44 WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES 
tables to INFORMATION_SCHEMA.
 2006-09-14 05:35:50 +04:00
guilhem@gbichot3.local
7e95cda2ac fixes for the my_atomic-t unit test: 
- compiler warning
- detection of pthread_create failure (you will see this message
only if you run with "make test-verbose" in unittest; otherwise
unit.pl masks all messages from the test but "ok" ones.
- the test fails randomly on some machines (I filed it as BUG#22320),
on one host it looks like a crash at exit() which a sleep(2) makes
disappear. So I add the sleep(2), which can be removed
when BUG#22320 is fixed.
 2006-09-14 01:37:41 +02:00
aivanov/alexi@mysql.com/mysqld.localdomain
9a87889482 WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES 
tables to INFORMATION_SCHEMA.
 2006-09-14 03:37:40 +04:00
tsmith/tim@siva.hindu.god
774e2bd2e6 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/51-mrg50
 2006-09-13 15:41:15 -06:00
tsmith/tim@siva.hindu.god
52c01e88d4 Post-merge fixes: 
- Remove extra EXTRA_DIST from several Makefile.ams
- Add dummy primary key to test table in loaddata_autocom.inc
 2006-09-13 15:37:35 -06:00
mskold/marty@linux.site
b44585fca3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-09-13 21:19:09 +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
f25084805d Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
 2006-09-13 14:18:05 -04:00
iggy@rolltop.ignatz42.dyndns.org
eb641f4a43 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix
 2006-09-13 14:16:53 -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
mskold/marty@mysql.com/linux.site
2cab656a95 Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-09-13 19:59:22 +02:00
mskold/marty@mysql.com/linux.site
4139849910 Bug #21378 Alter table from X storage engine to NDB could cause data loss: updated results 2006-09-13 19:56:02 +02:00
kaa@polly.local
46f2a4dbc6 Fixed the faulty merge 2006-09-13 21:25:33 +04:00
mats@romeo.(none)
ca50d070a0 WL#3259 (RBR with more columns on slave than master): 
Incorporating changes from review.
Fixing one bug that surfaced.
 2006-09-13 19:25:12 +02:00
mskold/marty@mysql.com/linux.site
9ff78327b9 Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-09-13 18:50:47 +02:00
mskold/marty@mysql.com/linux.site
4979d1526c Bug #21378 Alter table from X storage engine to NDB could cause data loss: skip autodiscover of local tables 2006-09-13 18:49:05 +02:00
kaa@polly.local
8bccf49ec5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
 2006-09-13 20:33:54 +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
ahristov@bk-internal.mysql.com
895a4442de event_queue.cc: 
fix sigsegv
 2006-09-13 16:55:15 +02:00
cmiller@zippy.cornsilk.net
1b23488cab 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-13 09:41:07 -04:00
cmiller@zippy.cornsilk.net
8a5f986c5a Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0--windows-vio-uninit 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-13 09:40:07 -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
0c72338bb4 Merge maint1.mysql.com:/data/localhome/cmiller/bug15583/my51-bug15583 
into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.1-maint
 2006-09-13 15:13:52 +02: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
cmiller@maint1.mysql.com
54d1a8ef4d Merge maint1.mysql.com:/data/localhome/cmiller/bug15583/my50-bug15583 
into  maint1.mysql.com:/data/localhome/cmiller/bug15583/my51-bug15583
 2006-09-13 15:01:19 +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
timour/timka@lamia.home
fad645f23e Merge lamia.home:/home/timka/mysql/src/5.0-bug-21774-sm 
into  lamia.home:/home/timka/mysql/src/5.1-dbg
 2006-09-13 15:22:50 +03:00
kaa@polly.local
654c03fb4c Merge polly.local:/tmp/20924/bug20294/my51-bug20294 
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
 2006-09-13 16:09:29 +04: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
61e3f8eae1 Merge polly.local:/tmp/20924/bug20294/my50-bug20294 
into  polly.local:/tmp/20924/bug20294/my51-bug20294
 2006-09-13 16:00:15 +04:00
mskold/marty@mysql.com/linux.site
6c472b9a9d Bug #21378 Alter table from X storage engine to NDB could cause data loss: post review fix 2006-09-13 13:41:05 +02: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
mskold/marty@linux.site
b895a180c4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-09-13 12:17:48 +02:00
tsmith@maint2.mysql.com
6a31ec2cad Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50 
into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/51
 2006-09-13 09:03:52 +02:00
kaa@polly.local
3c6a9040d2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
 2006-09-12 23:18:30 +04:00
tsmith@maint2.mysql.com
a1c4a48b7e Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg/g51 
into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg/51
 2006-09-12 19:40:00 +02:00
svoj@april.(none)
8dba18f742 After merge fix. 2006-09-12 21:38:57 +05:00