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

32818 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ingo@mysql.com
f02641487a Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug5390
 2006-04-05 20:35:36 +02: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
ingo@mysql.com
0577a243ed Merge mysql.com:/home/mydev/mysql-5.0-bug5390 
into  mysql.com:/home/mydev/mysql-5.1-bug5390
 2006-04-05 15:00:28 +02:00
konstantin@mysql.com
976a7493d3 Remove dead code from BUILD/ scripts. 2006-04-05 16:50:12 +04:00
ingo@mysql.com
c864ac15a5 BUG#5390 - problems with merge tables 
Additional fix for INSERT DELAYED with subselect.
Originally detected in 5.1, but 5.0 could also be affected.
The user thread creates a dummy table object,
which is not included in the lock. The 'real' table is
opened and locked by the 'delayed' system thread.
The dummy object is now marked as not locked and this is
tested in mysql_lock_have_duplicate().
 2006-04-05 14:39:20 +02: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
jonas@perch.ndb.mysql.com
abc9354c4a merge 2006-04-05 11:52:35 +02:00
msvensson@neptunus.(none)
1452892816 Incorporate a patch to write a timestamp for every new line of the test that is executed. 
This makes it possible make a graph (with for example gnuplot) of a test run and spot where most time is consumed.
Add the new code inside an "#if 0" until it's portable.
 2006-04-05 11:47:12 +02:00
ingo@mysql.com
ac52c977aa Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug5390
 2006-04-05 11:38:16 +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
jonas@perch.ndb.mysql.com
0e410aa1b3 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-04-05 11:21:36 +02:00
msvensson@neptunus.(none)
f1a2c7b14f use "unsigned long" type just as in function declaration and add surrounding parentheses. 2006-04-05 11:20:12 +02: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
msvensson@shellback.(none)
b0c6455908 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-04-05 10:08:38 +02:00
msvensson@neptunus.(none)
8ed7d70e4d Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-04-05 09:45:53 +02:00
msvensson@neptunus.(none)
c1074b59c6 Merge 192.168.0.12:mysql/mysql-5.0/ 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-04-05 09:39:29 +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
jimw@mysql.com
1a59580dcd Bug #13601: Wrong int type for bit 
The wrong value was being reported as the field_length for BIT
  fields, resulting in confusion for at least Connector/J. The
  field_length is now always the number of bits in the field, as
  it should be.
 2006-04-04 17:54:58 -07: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
msvensson@shellback.(none)
abc72552b5 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/bug17368/my51-bug17368
 2006-04-04 10:00:27 +02:00
msvensson@shellback.(none)
67bcb953aa Bug#17368 General log and slow query log don't work 
- Port ha_tina.cc to run on windows
 2006-04-04 09:59:19 +02:00
msvensson@shellback.(none)
d387211106 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-04-04 09:51:06 +02:00
msvensson@shellback.(none)
d4c7943891 Add option --debugger=NAME and --client-debugger=NAME. 
Add support for "--debugger=windbg" and "--debugger=vcexpress"
 2006-04-04 09:49:32 +02:00