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
37881 commits 2781 branches 343 tags 1.6 GiB
Commit graph

37881 commits

This branch
This branch
All branches
Author SHA1 Message Date
stewart@willster.(none)
e7a1495f22 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20809
 2006-09-20 17:23:46 +10:00
stewart@willster.(none)
6a98b6c39e Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20073
 2006-09-20 15:27:45 +10:00
mskold/marty@mysql.com/linux.site
b98987db17 C style comments 2006-09-19 15:18:43 +02:00
mskold/marty@linux.site
e3c7886768 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-09-19 11:34:03 +02:00
mskold/marty@mysql.com/linux.site
e8abf51de1 Bug #18679 rpl_ndb_dd_advance.test fails randomly 2006-09-19 11:31:55 +02:00
stewart@willster.(none)
6ff9664d46 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20073
 2006-09-19 18:36:18 +10:00
stewart@willster.(none)
40dffeba03 BUG#20809 mysqldump does not backup TS and LG information correctly. 
We were not parsing the EXTRA field to get UNDO_BUFFER_SIZE for the
CREATE LOGFILE GROUP statement in the dump.
 2006-09-19 17:07:21 +10:00
stewart@willster.(none)
49eb41e09d BUG#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS, 
Change things around so that we add a row for each log file group that lists
the free space for that log file group.
 2006-09-19 01:44:32 +10:00
mskold/marty@linux.site
dd1c43ba2a Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-09-18 13:11:03 +02:00
mskold/marty@mysql.com/linux.site
d1fd23b1c9 Bug #21378 Alter table from X storage engine to NDB could cause data loss: added show tables to ensure tables are gone 2006-09-18 13:00:21 +02:00
mskold/marty@linux.site
8ae0ff4cb9 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-09-18 10:51:00 +02:00
mskold/marty@mysql.com/linux.site
b36d0a1ac1 Added InnoDB dependency 2006-09-18 10:42:59 +02:00
mskold/marty@linux.site
d91db66c67 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-09-18 09:31:16 +02:00
mskold/marty@linux.site
66cbf07d05 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-09-18 09:26:18 +02:00
mskold/marty@mysql.com/linux.site
8292bd5770 Bug #21056 ndb pushdown equal/setValue error on datetime: thread safe bitmap not needed 2006-09-18 09:24:30 +02:00
mskold/marty@linux.site
179564c9bb Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-09-15 16:10:37 +02:00
mskold/marty@linux.site
67aeec035b Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-09-15 15:56:20 +02:00
mskold/marty@mysql.com/linux.site
528e8b4c0e Bug #21056 ndb pushdown equal/setValue error on datetime: post review fixes, use my_bitmap 2006-09-15 15:51:05 +02:00
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
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
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
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
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
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
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
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
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
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
cmiller@zippy.cornsilk.net
4cb1fdfb35 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my50-bug21618 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my51-bug21618
 2006-09-14 09:56:06 -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
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
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
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
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
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