mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
38011 commits 2784 branches 343 tags 1.6 GiB
Commit graph

38011 commits

This branch
This branch
All branches
Author SHA1 Message Date
lars/lthalmann@dl145j.mysql.com
57a74ea4af Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-21 00:23:20 +02:00
mats@romeo.(none)
0d019e0380 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl
 2006-09-19 13:47:15 +02:00
mats@romeo.(none)
78ad0eee91 Fixing and checking result for mysqldump test. 2006-09-18 21:09:48 +02:00
gkodinov@dl145s.mysql.com
ba7a873172 Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
 2006-09-18 17:45:29 +02:00
georg@lmy002.wdf.sap.corp
df606b28b1 In current 5.1 build we don't build embedded server for windows (this will be 
fixed when 5.1-win will be pushed into main tree).
Commenting the libmysqld and libmysqld/example subdirectories will allow us 
to upgrade from cmake 2.2 to 2.4.
 2006-09-18 17:28:17 +02:00
gkodinov@dl145s.mysql.com
809d1cfe2f Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
 2006-09-18 17:06:13 +02:00
gkodinov@dl145s.mysql.com
cf9d1c9152 Merge bk-internal:/home/bk/mysql-5.0 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-09-18 19:01:07 +04:00
gkodinov@dl145s.mysql.com
c1035c210b Merge bk-internal:/home/bk/mysql-5.1-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
 2006-09-18 18:33:11 +04:00
gkodinov@dl145s.mysql.com
f1100c007d merge fixes 2006-09-18 18:30:51 +04:00
gkodinov@dl145s.mysql.com
ce8ed889d7 Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
 2006-09-18 12:57:20 +02:00
gkodinov@dl145s.mysql.com
2ec485f06e Merge bk-internal:/home/bk/mysql-5.0-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-09-18 12:20:20 +02:00
gkodinov@dl145s.mysql.com
fae596aafd merge fixes 2006-09-18 12:14:27 +02:00
evgen@moonbone.local
f42385e0d1 disabled.def: 
Enabled rpl_sp_effects test due to fixed bug.
 2006-09-18 13:53:30 +04: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
gkodinov@dl145s.mysql.com
fcf99e859f Merge bk-internal:/home/bk/mysql-4.1-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
 2006-09-18 11:09:56 +02:00
mats@romeo.(none)
604aa87ebb Adding tests lost in the merge. 2006-09-18 10:08:10 +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
baker@bk-internal.mysql.com
343e08391d Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-09-16 07:19:42 +02:00
cmiller@zippy.cornsilk.net
dc8449886f 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 18:19:09 -04: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
brian@zim.(none)
f79ddec1f2 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-15 10:48:30 -07:00
brian@zim.(none)
7194b6d75a This changes the order of the universe, black is now the new white. 
In practice this means that handlerton is now created by the server and is passed to the engine. Plugin startups can now also control how plugins are inited (and can optionally pass values). Bit more flexibility to those who want to write plugin interfaces to the database.
 2006-09-15 10:28:00 -07: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)
d8e27606e1 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 18:00:03 +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
msvensson@shellback.(none)
6a0841a1bc Add definition of SHUT_RDWR for compiling on windows 2006-09-15 17:53:45 +02: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
msvensson@shellback.(none)
b0fc6840b4 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 17:09:58 +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
msvensson@shellback.(none)
8f7eac7a35 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-15 17:01:28 +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
msvensson@shellback.(none)
27d8545868 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 17:00:29 +02:00
msvensson@shellback.(none)
f1e91ec7f7 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-15 17:00:09 +02:00
msvensson@shellback.(none)
b178e40cae Merge shellback.(none):/home/msvensson/mysql/bug20602/my50-bug20602 
into  shellback.(none):/home/msvensson/mysql/work/my50-work
 2006-09-15 16:57:37 +02:00
msvensson@shellback.(none)
bfc3cfd4ee Merge msvensson.mysql.internal:mysql/my50-m-bug16574 
into  shellback.(none):/home/msvensson/mysql/work/my50-work
 2006-09-15 16:55:47 +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
msvensson@shellback.(none)
cda04e76f5 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-15 16:53:21 +02:00
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)
e9dab2149d Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-15 16:51:30 +02:00
msvensson@shellback.(none)
59c80b4165 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-15 16:50:25 +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)
ec7b20c32f Merge shellback.(none):/home/msvensson/mysql/bug22139/my51-bug22139 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-15 16:46:57 +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
msvensson@shellback.(none)
211aceca68 Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139 
into  shellback.(none):/home/msvensson/mysql/bug22139/my51-bug22139
 2006-09-15 16:41:50 +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
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