database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity
38,011 Commits 3,346 Branches 1,099 Tags
57a74ea4afeecf581ed203c45723da2d4dcd4e50
Commit Graph

11255 Commits

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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
evgen@moonbone.local
9fb0340a34 item_cmpfunc.cc: 
Removed changes to the Item_func_between::fix_length_and_dec() made in the fix for bug#16377
query_cache.result:
  Corrected a test case after removing a fix for bug#16377
 2006-09-12 19:06:26 +04:00
timour/timka@lamia.home
38a450b44a Fix for BUG#21774: Column count doesn't match value count at row x 
The cause of the bug was an incomplete fix for bug 18080.
The problem was that setup_tables() unconditionally reset the
name resolution context to its 'tables' argument, which pointed
to the first table of an SQL statement.

The bug fix limits resetting of the name resolution context in
setup_tables() only in the cases when the context was not set
by earlier parser/optimizer phases.
 2006-09-12 17:50:24 +03:00
kaa@polly.local
ca48b7af0c Merge polly.local:/tmp/20924/bug20294/my50-bug20294 
into  polly.local:/tmp/20924/bug20294/my51-bug20294
 2006-09-12 18:43:38 +04:00