database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Code Activity
38,405 Commits 3,270 Branches 1,096 Tags
defd43d496a758271fb0a88ca0e30c8c7bbe24e1
Commit Graph

14134 Commits

Author SHA1 Message Date
istruewing@chilla.local
06b721f104 Merge 5.1 -> 5.1-engines 
Disabled innodb_mysql to get autopush through
 2006-09-15 21:42:49 +02:00
istruewing@chilla.local
e88cd60fd3 Merge 5.1 -> 5.1-engines 
Disabled index_merge_myisam to get autopush through
 2006-09-15 20:32:09 +02:00
istruewing@chilla.local
92e5f116cb Merge 5.1 -> 5.1-engines 
Disabled index_merge_innodb to get autopush through
 2006-09-15 19:31:42 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
b537b46255 modifying disabled file so it is a copy of main tree 2006-09-15 18:24:12 +02:00
msvensson@shellback.(none)
a29f9c3b2e Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-15 18:08:03 +02:00
msvensson@shellback.(none)
61bffe0c6b Removing disabling of func_group 2006-09-15 17:59:16 +02:00
msvensson@shellback.(none)
3abb1684f7 Remove disabling of func_in 2006-09-15 17:57:56 +02:00
gkodinov/kgeorge@macbook.gmz
c73d2318a3 Merge bk-internal:/home/bk/mysql-4.1-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B21180-4.1-opt
 2006-09-15 18:56:05 +03:00
cmiller@zippy.cornsilk.net
895bf0555b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-15 11:25:02 -04:00
istruewing@chilla.local
525ff08213 Merge 5.1 -> 5.1-engines 
Disabled im_daemon_life_cycle with permission by Calvin
 2006-09-15 17:17:56 +02:00
aelkin@dl145h.mysql.com
acca475a9c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  dl145h.mysql.com:/tmp/andrei/5.1-rpl
 2006-09-15 17:04:14 +02:00
aelkin@dl145h.mysql.com
cb7dbdea71 bug#19259 rpl_ndb_dd_partitions fails because of limitation 
re-activating the bug to fix related to the limitation tests.
 2006-09-15 17:00:35 +02:00
aelkin/elkin@dsl-hkigw8-fe00f800-98.dhcp.inet.fi
cb2fa1d715 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  dsl-hkigw8-fe00f800-98.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
 2006-09-15 17:55:05 +03:00
aelkin/elkin@dsl-hkigw8-fe00f800-98.dhcp.inet.fi
6055e8a9f7 Bug#22067 rpl_rbr_to_sbr and some other fail if NDB is default storage 
A query SET @@GLOBAL.binlog_format = ... returns an error when NDB is the
default storage. This fails some tests invoking the set binlog_format explicitly.
because the var turns to be read-only.
  
  In the following are files and method to fix if needed.
  
  t/
  ndb_binlog_basic2.test         # here the failure is benign
  rpl_rbr_to_sbr.test            # does not check any ndb features =>           
 
  .                              # => not_ndb_default is enough
  rpl_row_basic_8partition.test  # set binlog_format can be replaced
  rpl_switch_stm_row_mixed.test  # does not check any ndb features =>
  .                              # => not_ndb_default is enough
  
  two more invoking invoke extra/rpl_truncate_helper.test
  
  rpl_truncate_2myisam           # to be fixed with not_ndb_default
  rpl_truncate_3innodb           # same as above
  .                              # because there is a dedicated to ndb .        
 
  .                              # rpl_truncate_7ndb* suit.

Adapting/testing a new implement
--source include/safe_set_to_maybe_ro_var.inc
to avoid abort due to the error using binlog_format as application.
 2006-09-15 17:25:13 +03: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@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
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)
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
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
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
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
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
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
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
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
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
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
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
Kristofer.Pettersson@naruto.
441e16e807 Cset exclude: Kristofer.Pettersson@naruto.|ChangeSet|20060912122341|50740 2006-09-14 11:37:33 +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
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
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