mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
48998 commits 2785 branches 343 tags 1.6 GiB
Commit graph

48998 commits

This branch
This branch
All branches
Author SHA1 Message Date
gkodinov/kgeorge@magare.gmz
e53af13d1e rpl_row_tabledefs_2myisam.result: 
merged 5.1-main to 5.1-opt : error numbers changed.
Many files:
   merged 5.1-main to 5.1-opt : error numbers changed
rpl_extraCol_innodb.result:
  merged 5.1-main to 5.1-opt : error numbers changed
 2007-08-05 14:02:33 +03:00
igor@olga.mysql.com
a5e4e70100 Merge olga.mysql.com:/home/igor/mysql-5.1 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-merge
 2007-08-04 22:36:54 -07:00
igor@olga.mysql.com
fd3be5034e Removed warnings after fix for bug 28404. 2007-08-04 20:31:48 -07:00
igor@olga.mysql.com
e39d06e7d3 Made the test case for bug 28404 platform independent. 2007-08-04 17:15:33 -07:00
igor@olga.mysql.com
3b1dd15e0d Made sure that the test case for bug 28404 use the correct statistics. 2007-08-04 13:41:01 -07:00
igor@olga.mysql.com
4acba86e59 Post-merge fix. 2007-08-04 03:12:43 -07:00
igor@olga.mysql.com
d51731a322 Fixed a memory leak in the patch for bug 28404. 2007-08-03 21:10:57 -07:00
mkindahl@dl145h.mysql.com
92d4958eb7 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team
 2007-08-03 19:04:59 +02:00
mkindahl@dl145h.mysql.com
ea9848094a Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team
 2007-08-03 18:59:16 +02:00
mkindahl@dl145h.mysql.com
efb82b3aac Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team
 2007-08-03 18:56:06 +02:00
igor@olga.mysql.com
9c09b7d523 Merge olga.mysql.com:/home/igor/mysql-5.1-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug28404
 2007-08-03 08:46:01 -07:00
mkindahl@dl145h.mysql.com
6cc184aa1b Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
 2007-08-03 17:14:46 +02:00
mkindahl@dl145h.mysql.com
008d2b2537 Fixes to eliminate valgrind warnings. 2007-08-03 17:12:00 +02:00
gkodinov/kgeorge@magare.gmz
b2661dd379 Merge magare.gmz:/home/kgeorge/mysql/work/B25228-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B25228-5.1-opt
 2007-08-03 15:44:40 +03:00
gkodinov/kgeorge@magare.gmz
ea0ad90339 Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B25228-5.1-opt
 2007-08-03 15:43:53 +03:00
bar@bar.myoffice.izhnet.ru
fb8dff9721 Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b28875
 2007-08-03 17:16:02 +05:00
gkodinov/kgeorge@magare.gmz
2bfbe2cd84 Bug #25228: rpl_relayspace.test fails on powermacg5, vm-win2003-32-a 
A test case was waiting for a fixed number of seconds for a specific 
state of the slave IO thread to take place.
Fixed by waiting in a loop for that specific thread state instead 
(or timeout).
 2007-08-03 14:14:33 +03:00
bar@mysql.com/bar.myoffice.izhnet.ru
7754da28f9 After merge fix 2007-08-03 15:57:14 +05:00
gshchepa@bk-internal.mysql.com
a976fd4bf4 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-opt 
into  bk-internal.mysql.com:/users/gshchepa/5.1-opt
 2007-08-03 12:37:01 +02:00
gshchepa@dl145s.mysql.com
c342712b35 Many files: 
Post-merge fix.
 2007-08-03 12:37:00 +02:00
bar@bar.myoffice.izhnet.ru
c01ce7b1e3 Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875 
into  mysql.com:/home/bar/mysql-work/mysql-5.0-rpl
 2007-08-03 15:30:31 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
4eebfd09c2 Bug#28875 Conversion between ASCII and LATIN1 charsets does not function 
(Regression, caused by a patch for the bug 22646).
Problem: when result type of date_format() was changed from
binary string to character string, mixing date_format()
with a ascii column in CONCAT() stopped to work.
Fix:
- adding "repertoire" flag into DTCollation class,
to mark items which can return only pure ASCII strings.
- allow character set conversion from pure ASCII to other character sets.
 2007-08-03 15:25:23 +05:00
gshchepa/uchum@gleb.loc
92eb485fe2 Many files: 
Post-merge fix.
 2007-08-03 13:07:37 +05:00
gkodinov/kgeorge@magare.gmz
c076b6c126 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30193-5.0-opt
 2007-08-03 10:47:41 +03:00
gkodinov/kgeorge@magare.gmz
dfcd9b7418 Merge magare.gmz:/home/kgeorge/mysql/work/B30193-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B30193-5.1-opt
 2007-08-03 10:44:09 +03:00
cbell/Chuck@mysql_cab_desk.
f42cf05ad4 WL#3228 (NDB) : RBR using different table defs on slave/master 
This patch removes a portion of the last patch to Field_blob::copy
after problems found during testing of tests using distinct operations.
 2007-08-02 21:18:41 -04:00
gshchepa/uchum@gleb.loc
d933b0b4a0 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-03 02:15:21 +05:00
gshchepa/uchum@gleb.loc
176a20f22b Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-03 02:05:10 +05:00
gshchepa/uchum@gleb.loc
58f697f55a Merge gleb.loc:/home/uchum/work/bk/5.0-opt-27352 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-03 02:03:01 +05:00
gshchepa/uchum@gleb.loc
b63f8f8985 Fixed bug #27352. 
The SELECT query with more than 31 nested dependent SELECT queries returned
wrong result.

New error message has been added: ER_TOO_HIGH_LEVEL_OF_NESTING_FOR_SELECT.
It will be reported as: "Too high level of nesting for select".
 2007-08-03 01:58:21 +05:00
cbell/Chuck@mysql_cab_desk.
e8aff50790 WL#3228 (NDB) : RBR using different table defs on slave/master 
This patch corrects a problem found during testing on Solaris. The code
changes how length values are retrieved on big endian machines. The
patch allows the rpl_extraColmaster tests to run on these machines.
 2007-08-02 16:15:52 -04:00
igor@olga.mysql.com
cf39429295 Fixed bug#28404. 
This patch adds cost estimation for the queries with ORDER BY / GROUP BY
and LIMIT. 
If there was a ref/range access to the table whose rows were required
to be ordered in the result set the optimizer always employed this access
though a scan by a different index that was compatible with the required 
order could be cheaper to produce the first L rows of the result set.
Now for such queries the optimizer makes a choice between the cheapest
ref/range accesses not compatible with the given order and index scans
compatible with it.
 2007-08-02 12:45:56 -07:00
cbell/Chuck@mysql_cab_desk.
dc2cab6561 Merge mysql_cab_desk.:C:/source/c++/mysql-5.1 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl-merge
 2007-08-02 15:27:47 -04:00
cbell/Chuck@mysql_cab_desk.
62f8d8c64a Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1
 2007-08-02 15:15:48 -04:00
evgen@moonbone.local
e9eb6309fb mysqld.cc: 
Post merge changes.
 2007-08-02 23:08:52 +04:00
evgen@moonbone.local
2943ddc61e sql_class.h: 
After merge changes.
 2007-08-02 21:49:27 +04:00
evgen@moonbone.local
0f500567f7 Merge moonbone.local:/mnt/gentoo64/work/24989-bug-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
 2007-08-02 20:30:06 +04:00
evgen@moonbone.local
9c8673de05 Merge moonbone.local:/mnt/gentoo64/work/24989-bug-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
 2007-08-02 18:42:56 +04:00
gkodinov/kgeorge@magare.gmz
fed7ee340b Bug #30193: crash during drop table and kill 
When DROP TABLE detects that it has been killed
by another thread it must unlock the table names
it locked.

Fixed by backporting the 5.1 error handling code.
 2007-08-02 17:11:35 +03:00
ramil/ram@ramil.myoffice.izhnet.ru
0d9301585b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b30088/b30088.5.0
 2007-08-02 18:23:23 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e8eaca54a3 After-merge fix: result adjusted. 2007-08-02 17:14:48 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
7512856c31 Merge mysql.com:/home/ram/work/b30088/b30088.5.0 
into  mysql.com:/home/ram/work/b30088/b30088.5.1
 2007-08-02 16:56:32 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
54ddf93240 Merge mysql.com:/home/ram/work/b30200/b30200.5.0 
into  mysql.com:/home/ram/work/b30200/b30200.5.1
 2007-08-02 15:26:52 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
dc84a5fd52 Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol 
Problem: thd->thread_specific_used flag is not set executing a statement
containig connection_id() function using PS protocol, that leads to 
improper binlog event creation.

Fix: set the flag in the Item_func_connection_id::fix_fields().
 2007-08-02 14:51:03 +05:00
gkodinov/kgeorge@magare.gmz
b5ac35fa17 Addendum to bug 29325 
keep_files_on_create made a startup option
 2007-08-02 12:35:05 +03:00
tsmith@ramayana.hindu.god
0f6f44424f Post-merge fix. Update some test results, and add an InnoDB-only 
compatibility hook, thd_mark_transaction_to_rollback().
 2007-08-02 02:22:31 -06:00
tsmith@ramayana.hindu.god
b13de9343f Merge 50 -> 51 (-opt changesets) 2007-08-01 18:59:41 -06:00
tsmith@ramayana.hindu.god
d66b4bd4be Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:41:02 -06:00
tsmith@ramayana.hindu.god
a52a078f75 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 18:40:02 -06:00
tsmith@ramayana.hindu.god
534c3f325d Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:39:13 -06:00