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

32579 commits

This branch
This branch
All branches
Author SHA1 Message Date
bar@mysql.com
ceb0a0b2d5 Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-04-06 12:00:14 +05:00
bar@mysql.com
0459d69d7a Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-04-06 10:53:42 +05:00
bar@mysql.com
925ea02b4c This problem has already been fixed by one of the previous changes. 
Adding test case to cover queries which worked incorrectly earlier:
Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci
 2006-04-06 10:51:23 +05:00
bar@mysql.com
a83d206811 ctype-extra.c: 
Using local.
 2006-04-06 10:23:42 +05:00
bar@mysql.com
743f96da9c Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-04-06 10:21:33 +05:00
bar@mysql.com
8f1bddb8ed conf_to_src.c: 
Backporting a 5.0 change:
  MAX_BUF was too small for Index.xml
  Changeing MAX_BUF and adding assert to easier
  catch the same problem in the future.
ctype-extra.c:
  Regenerating ctype-extra.c with the fixed conf_to_src.
 2006-04-06 10:17:01 +05:00
igor@rurik.mysql.com
e732d0536f Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-05 14:06:34 -07:00
igor@rurik.mysql.com
58ad55937d Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-04-05 14:00:54 -07:00
bar@mysql.com
d590331d3c Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-04-05 23:01:10 +05:00
evgen@sunlight.local
368b92390c Manually merged 2006-04-05 20:12:26 +04:00
bar@mysql.com
139808f020 ctype-extra.c: 
Recreating ctype-extra.c with additional 5.1
  charset, and with additional missing 5.0 charset
  due to bug with too small buffer MAX_BUF.
 2006-04-05 19:52:47 +05:00
bar@mysql.com
31ef6c7c79 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-04-05 19:47:36 +05:00
bar@mysql.com
52220d2d79 conf_to_src.c: 
Buffer was too small to load Index.xml.
  So some charsets were not gerenrated.
  Making the buffer bigger, and adding an DBUG_ASSERT,
  to easier catch the problem in the future.
ctype-extra.c:
  Additional charsets were generated.
 2006-04-05 19:43:38 +05:00
bar@mysql.com
cbcd9cd575 Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-04-05 19:00:02 +05:00
konstantin@mysql.com
59f20d290f Remove dead code from BUILD/ scripts: $debug_extra_warnings is 
never defined.
It was used at some point to add -Wuninitialized to debug flags, 
but not any more. If there is still need to add -Wunitialized,
it can be added directly to $global_warnings.
 2006-04-05 17:50:33 +04:00
mats@mysql.com
d26cf9f2c8 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b18436-mysql-5.1-new
 2006-04-05 15:18:51 +02:00
mats@mysql.com
1344cde60d Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b18436-mysql-5.1-new
 2006-04-05 15:16:02 +02:00
konstantin@mysql.com
976a7493d3 Remove dead code from BUILD/ scripts. 2006-04-05 16:50:12 +04:00
kent@mysql.com
196521bd99 Makefile.am: 
After merge correction
 2006-04-05 12:56:05 +02:00
mats@mysql.com
6d6c7e76c2 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b18436-mysql-5.1-new
 2006-04-05 12:54:53 +02:00
evgen@sunlight.local
d07240599d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into sunlight.local:/local_work/16281-bug-5.0-mysql
 2006-04-05 13:30:51 +04:00
evgen@sunlight.local
b9949ed9c7 Fixed bug #16281: Multi-table update broken in 5.0 on tables imported from 4.1 
Mutli-table uses temporary table to store new values for fields. With the
new values the rowid of the record to be updated is stored in a Field_string
field. Table to be updated is set as source table of the rowid field.
But when the temporary table creates the tmp field for the rowid field it
converts it to a varstring field because the table to be updated was created by
the v4.1. Due to this the stored rowids were broken and no records for 
update were found.

The flag can_alter_field_type is added to Field_string class. When it is set to
0 the field won't be converted to varstring. The Field_string::type() function 
now always returns MYSQL_TYPE_STRING if can_alter_field_type is set to 0.
The multi_update::initialize_tables() function now sets can_alter_field_type
flag to 0 for the rowid fields denying conversion of the field to a varstring
field.
 2006-04-05 13:29:04 +04:00
kent@mysql.com
1f88c4e5df Merge mysql.com:/Users/kent/mysql/bk/tmp_merge 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-04-05 10:39:44 +02:00
mats@mysql.com
7b250a3fc0 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b18436-mysql-5.1-new
 2006-04-05 09:10:31 +02:00
kent@mysql.com
b492d05ee9 Merge 2006-04-04 23:37:44 +02:00
igor@rurik.mysql.com
f485125968 Fixed bug #18237. 
The code in opt_sum_query that prevented the COUNT/MIN/MAX 
optimization from being applied to outer joins  was not adjusted 
after introducing nested joins. As a result if an outer join
contained a reference to a view as an inner table the code of
opt_sum_query missed the presence of an on expressions and
erroneously applied the mentioned optimization.
 2006-04-04 12:55:02 -07:00
joerg@mysql.com
d99d4d9bb1 Merge 2006-04-04 20:25:23 +02:00
mats@mysql.com
0729afd839 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b18436-mysql-5.1-new
 2006-04-04 19:44:03 +02:00
timour@mysql.com
51476082b7 Merge mysql.com:/home/timka/mysql/src/5.0-tmp-merge 
into  mysql.com:/home/timka/mysql/src/5.1-merge
 2006-04-04 14:35:17 +03:00
igor@rurik.mysql.com
679dbc7627 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-04 04:35:16 -07:00
tomas@poseidon.ndb.mysql.com
8237832aac Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-04 13:35:15 +02:00
sergefp@mysql.com
b83da14c6a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/psergey/mysql-5.1-bug18659-pre
 2006-04-04 15:35:14 +04:00
bar@mysql.com
562386b9a9 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-04-04 15:42:32 +05:00
bar@mysql.com
1c74e21809 After merge fix for Bug#12076 --with-extra-charsets has no effect 2006-04-04 15:40:42 +05:00
igor@rurik.mysql.com
274afed734 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rurik.mysql.com:/home/igor/mysql-5.0
 2006-04-04 02:50:55 -07:00
tomas@poseidon.ndb.mysql.com
93f1422aca Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-04-04 11:50:54 +02:00
tomas@poseidon.ndb.mysql.com
7cd8c8428a Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-04 11:48:28 +02:00
tomas@poseidon.ndb.mysql.com
63f5820217 Bug #18349 Wrong error message "Array index out of bounds... 2006-04-04 11:34:31 +02:00
tomas@poseidon.ndb.mysql.com
6ff2ba05db Bug #18490 cluster: binlog events lost on remote mysqld (asynchronous) 2006-04-04 11:25:02 +02:00
tomas@poseidon.ndb.mysql.com
2c7d48c846 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-04 10:23:05 +02:00
igor@rurik.mysql.com
0b60e05646 Merge rurik.mysql.com:/home/igor/mysql-5.1 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-04-03 23:26:31 -07:00
igor@rurik.mysql.com
c4e61aa478 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-03 21:10:23 -07:00
igor@rurik.mysql.com
26b2c5d7bd Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rurik.mysql.com:/home/igor/mysql-5.0
 2006-04-03 21:07:27 -07:00
igor@rurik.mysql.com
41a1d252d9 Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-04-03 21:04:38 -07:00
igor@rurik.mysql.com
788463869a Post review changes for the fix of bug #16504. 2006-04-03 21:02:40 -07:00
sergefp@mysql.com
2130fd06bd BUG#18659: In get_part_iter_for_interval_via_walking(), when we need to 
obtain partition number, call partition_info->get_part_partition_id() when
the table has subpartitions, and get_partition_id() otherwise. (The bug
was that we were always doing the latter)
 2006-04-04 00:52:14 +04:00
acurtis@xiphis.org
7accd6844b include example storage engines in max build 2006-04-03 11:51:57 -07:00
tomas@poseidon.ndb.mysql.com
d0ca8374cd Bug #18596 binlog schema event auto push causes mysqld errors 
- move slock bitmask to separate hash list, object living only during query
 2006-04-03 19:11:20 +02:00
bpontz@shasta.mysql.com
3ad9bc880d .libs is no longer used when compiling netware 2006-04-03 11:54:09 -04:00
mats@mysql.com
9150b2169b Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b18436-mysql-5.1-new
 2006-04-03 15:31:12 +02:00