database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-02 02:53:04 +03:00
Code Activity
27,128 Commits 3,252 Branches 1,092 Tags
4ddfe56f9abe3b2c84328a43a454c152bf22dba7
Commit Graph

12912 Commits

Author SHA1 Message Date
mskold@mysql.com
4ddfe56f9a Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-10-14 11:28:01 +02:00
mskold@mysql.com
f9b58b0805 Fix for Bug #13961 Triggers on tables with auto_increment insert bogus values into table (clean version) 2005-10-14 11:23:02 +02:00
monty@mysql.com
a320173935 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-10-14 11:45:20 +03:00
monty@mysql.com
4561014afa Fixed compile errors on windows 2005-10-14 11:44:46 +03:00
bar@mysql.com
0bf436a058 Merge mysql.com:/usr/home/bar/mysql-4.1.b13751 
into  mysql.com:/usr/home/bar/mysql-5.0.char1
 2005-10-14 12:07:13 +05:00
bar@mysql.com
5df9c6c2a3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
 2005-10-14 11:54:10 +05:00
bar@mysql.com
58343bede3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
 2005-10-14 09:09:25 +05:00
bar@mysql.com
8bd1ccc642 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.char1
 2005-10-14 08:20:02 +05:00
monty@mysql.com
3da5f1c223 Move handling of suffix_length from strnxfrm_bin() to filesort to ensure proper sorting of all kind of binary objects 
field::sort_key() now adds length last for varbinary/blob
VARBINARY/BLOB is now sorted by filesort so that shorter strings comes before longer ones
Fixed issues in test cases from last merge
 2005-10-14 00:04:52 +03:00
bell@sanja.is.com.ua
6d6e107f12 - set 'updating' in both tables list if we have two of them (because of subquery) (BUG#13236) 
- fixed test
 2005-10-14 00:02:38 +03:00
monty@mysql.com
6f5baa1eba Merge mysql.com:/home/my/mysql-4.1 
into  mysql.com:/home/my/mysql-5.0
 2005-10-13 20:18:37 +03:00
monty@mysql.com
1436494a72 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-10-13 20:18:36 +03:00
bar@mysql.com
fee9c13568 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b9278
 2005-10-13 22:18:35 +05:00
monty@mysql.com
49a30ef513 Fixes during review of new pushed code 2005-10-13 19:40:46 +03:00
monty@mysql.com
829a4831b1 Fixes during review of new code 2005-10-13 19:24:01 +03:00
jani@ua141d10.elisa.omakaista.fi
2dd1e4f94e Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-10-13 18:23:53 +03:00
hf@deer.(none)
62ffbea5e4 merging 2005-10-13 19:31:09 +05:00
bar@mysql.com
fa0dec7531 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.char1
 2005-10-13 19:27:44 +05:00
bar@mysql.com
7c81d7fc69 ctype_utf8.result, ctype_utf8.test: 
New syntax: CHAR(x USING charset)
  Adding test case.
sql_yacc.yy:
  New syntax: CHAR(x USING charset)
  Adding new parser rule.
item_strfunc.h:
  New syntax: CHAR(x USING charset)
  Adding a new constructor.
 2005-10-13 19:24:47 +05:00
hf@deer.(none)
c933505d2d Fix for bug #3874 (Group by field is not considered) 2005-10-13 19:23:52 +05:00
bar@mysql.com
c229567887 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b9278
 2005-10-13 19:19:05 +05:00
bar@mysql.com
39b0712cf7 type_binary.result, type_binary.test: 
new file
mysql_fix_privilege_tables.sql, mysql_create_system_tables.sh:
  Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
Many files:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
  Adding true BINARY/VARBINARY: new pad_char structure member.
ctype-bin.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
  New strnxfrm, with two trailing length bytes.
field.cc:
  Adding true BINARY/VARBINARY.
 2005-10-13 19:16:19 +05:00
evgen@moonbone.local
818c37ac68 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/13535-bug-4.1-mysql
 2005-10-13 17:17:32 +04:00
evgen@moonbone.local
4d2a58f848 Manual merge of bug fix #7672 2005-10-13 16:00:26 +04:00
konstantin@mysql.com
37aa6efd0a A post-review fix (Bug#12736) 2005-10-13 14:55:56 +04:00
konstantin@mysql.com
5269826383 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-12736
 2005-10-13 14:46:57 +04:00
kent@mysql.com
2747a73857 Merge 2005-10-13 12:23:50 +02:00
kent@mysql.com
5b448a8d9f Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmp 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-13 12:09:39 +02:00
elliot@mysql.com
a93780b23d BUG#13343 CREATE|etc TRIGGER|VIEW|USER don't commit the transaction (inconsistency) 
Updated more DDL statements to cause implicit commit.
 2005-10-13 05:12:17 -04:00
konstantin@mysql.com
f6899b0783 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-12736
 2005-10-13 12:17:20 +04:00
konstantin@mysql.com
b2ff38202d A fix and a test case for Bug#12736 "Server crash during a select". 
The bug was in JOIN::join_free which was wrongly determining that
all joins have been already executed and therefore all used tables
can be closed.
 2005-10-13 11:53:00 +04:00
jimw@mysql.com
701a137844 Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 16:07:16 -07:00
guilhem@mysql.com
a6ceb59491 fixes after merge of 4.1. 2005-10-13 00:29:23 +02:00
guilhem@mysql.com
fb3506f370 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.0
 2005-10-12 23:36:41 +02:00
evgen@moonbone.local
fb0074a6ad Manual merged 2005-10-13 01:14:58 +04:00
evgen@moonbone.local
551961b207 select.test, sql_select.cc, sql_lex.cc, item.cc: 
Bug #7672 after merge fix
 2005-10-13 00:58:59 +04:00
jimw@mysql.com
cb0d8aba46 Merge mysql.com:/home/jimw/my/mysql-4.1-8731b 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:28:46 -07:00
jimw@mysql.com
626c8a1c8c Merge mysql.com:/home/jimw/my/mysql-4.1-13344 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:27:49 -07:00
jimw@mysql.com
6a19058c55 Merge mysql.com:/home/jimw/my/mysql-4.1-13619 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:26:49 -07:00
evgen@moonbone.local
902b06ecb1 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/13535-bug-4.1-mysql
 2005-10-13 00:16:33 +04:00
guilhem@mysql.com
4252b546b3 Merge mysql.com:/home/mysql_src/mysql-4.1 
into  mysql.com:/home/mysql_src/mysql-5.0;
a very bad automerge (issues with non-ascii chars), plus some hard conflicts I'll fix by hand in a next cset
 2005-10-12 21:58:02 +02:00
dlenev@mysql.com
cfc5adaf13 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-repl
 2005-10-12 23:45:14 +04:00
dlenev@mysql.com
3ee7382703 Temporary solution for bug #13969 "Routines which are replicated from master 
can't be executed on slave". It will be possible to solve this problem
in more correct way when we will implement WL#2897 "Complete definer support
in the stored routines".
 2005-10-12 23:42:51 +04:00
guilhem@mysql.com
03ed3231af slave.cc: 
SCCS merged
 2005-10-12 21:25:04 +02:00
pem@mysql.com
304d4f580b Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13510/mysql-5.0
 2005-10-12 14:45:34 +02:00
sergefp@mysql.com
6266243deb Fix compile error on Windows: remove wrong typecast 2005-10-12 16:43:55 +04:00
pem@mysql.com
171f83944f Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13510/mysql-5.0
 2005-10-12 13:37:36 +02:00
guilhem@mysql.com
ab05c75ea7 merge 2005-10-12 13:31:48 +02:00
guilhem@mysql.com
4c1c9db823 Fix for BUG#13023: "SQL Thread is up but doesn't move forward". Details in slave.cc; 
in short we now record whenever the slave I/O thread ignores a master's event because of its server id,
and use this info in the slave SQL thread to advance Exec_master_log_pos. Because if we
do not, this variable stays at the position of the last executed event, i.e. the last *non-ignored*
executed one, which may not be the last of the master's binlog (and so the slave *looks* behind
the master though it's data-wise it's not).
 2005-10-12 13:29:55 +02:00
pem@mysql.com
b9b8349b3a Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13616/mysql-5.0
 2005-10-12 11:52:37 +02:00