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
39,108 Commits 3,270 Branches 1,096 Tags
eda71e24c32cda3ddcb578c4d866268bf43ad0ca
Commit Graph

14435 Commits

Author SHA1 Message Date
msvensson@shellback.(none)
f415523c17 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-18 11:34:07 +02:00
msvensson@shellback.(none)
0a59967cb0 Remove trailing whitespace 
Add linebreak
 2006-09-18 11:27:21 +02:00
msvensson@shellback.(none)
dd76996955 Move mysql-test-run.sh to new name mysql-test-run-shell.sh 
Symlink mysql-test-run to mysql-test-run.pl
 2006-09-18 11:22:51 +02:00
gkodinov@dl145s.mysql.com
522823b5d3 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-18 11:19:40 +02:00
mskold/marty@mysql.com/linux.site
b36d0a1ac1 Added InnoDB dependency 2006-09-18 10:42:59 +02:00
mats@romeo.(none)
604aa87ebb Adding tests lost in the merge. 2006-09-18 10:08:10 +02:00
aivanov/alexi@mysql.com/mysqld.localdomain
e2d15b16d2 BUG#19419: VIEW: View that the column name is different 
by master and slave is made.
 2006-09-18 03:21:00 +04:00
msvensson@shellback.(none)
dedcdda5df BUG#22396 crash_commit_before 
- Disable generation of core file and stacktrace when running this testcase, which would
   otherwise mark the whole testsuite as failed.
 2006-09-17 20:54:06 +02:00
Kristofer.Pettersson@naruto.
8ec47c091e Merge naruto.:C:/cpp/bug20789/my50-bug20789 
into  naruto.:C:/cpp/mysql-5.1-new-maint
 2006-09-17 14:06:29 +02:00
igor@rurik.mysql.com
dd3b8e4f9a Fixed bug #22085: Crash on the execution of a prepared 
statement that uses an aggregating IN subquery with 
HAVING clause.
A wrong order of the call of split_sum_func2 for the HAVING
clause of the subquery and the transformation for the 
subquery resulted in the creation of a andor structure
that could not be restored at an execution of the prepared
statement.
 2006-09-16 11:50:00 -07:00
istruewing@chilla.local
33acddb568 Merge 5.1 -> 5.1-engines 
Disabled im_instance_conf to get autopush through
 2006-09-16 20:32:01 +02:00
igor@rurik.mysql.com
d3d3cef88c Fixed bug #21493: crash for the second execution of a function 
containing a select statement that uses an aggregating IN subquery.
Added a parameter to the function fix_prepare_information 
to restore correctly the having clause for the second execution.
Saved andor structure of the having conditions at the proper moment
before any calls of split_sum_func2 that could modify the having structure
adding new Item_ref objects. (These additions, are produced not with 
the statement mem_root, but rather with the execution mem_root.)
 2006-09-16 09:50:48 -07:00
lars/lthalmann@mysql.com/dl145k.mysql.com
1963d68a08 Test case fixes 2006-09-16 13:20:06 +02:00
cmiller@zippy.cornsilk.net
66808ead4e Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-15 18:18:18 -04:00
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
petr/cps@owlet.local
2fe744c878 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/trees/5.1-runtime-new
 2006-09-15 17:24:13 +04: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
petr/cps@mysql.com/owlet.local
f6663df6d8 Post-review fixes for 
Bug #18559 "log tables cannot change engine, and
            gets deadlocked when dropping w/ log on":
1) Add more generic error messages
2) Add new handlerton flag for engines, which support
   log tables
3) Remove (log-tables related) mutex lock in myisam to
   improve performance
 2006-09-15 13:07:23 +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
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