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
10531 commits 2780 branches 343 tags 1.6 GiB
Commit graph

10531 commits

This branch
This branch
All branches
Author SHA1 Message Date
sergefp@mysql.com
e375fade90 Merge mysql.com:/home/psergey/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-compile
 2003-12-02 21:31:46 +03:00
sergefp@mysql.com
43221ad9e1 Fix for bug #1980 2003-12-02 21:20:51 +03:00
pem@mysql.com
2c16ccdbe6 Merge mysql.com:/home/pem/work/mysql-4.1 
into mysql.com:/home/pem/work/mysql-5.0
 2003-12-02 17:08:24 +01:00
konstantin@mysql.com
1be4a37fa2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/mysql/mysql-4.1-root
 2003-12-02 18:06:25 +03:00
hf@deer.(none)
02f382ecaa Fix for #1189 (Mess with names about CONSTRAINT) 
Second edition: error message was deleted as Segey suggested
Now name of the constraint will be used as the name of the key
if the last not specified
 2003-12-02 19:06:24 +04:00
konstantin@oak.local
c10413abda Item_param::save_in_field(): 
thd->command can be anything except COM_EXECUTE in no cases
except programming error.
 2003-12-02 15:09:35 +03:00
monty@mysql.com
05e4d9031b Ensure that innodb is created for the first replication test as the slave-timeout is lower for future tests and this failed on some slower machines 2003-12-02 13:32:05 +02:00
konstantin@mysql.com
f274f72c98 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/mysql/mysql-4.1-root
 2003-12-02 13:10:25 +03:00
igor@rurik.mysql.com
e282c8cc6f Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-1
 2003-12-01 16:20:46 -08:00
igor@rurik.mysql.com
37ad3d2f2d index_merge.result: 
Fixed inconsistency of values of used_tables_cache
  and const_item_cache for Item_func_isnull objects (bug #1990).
 2003-12-01 16:15:25 -08:00
igor@rurik.mysql.com
441ad81b48 join_outer.result, null.result, null.test: 
Fixed inconsistency of values of used_tables_cache
  and const_item_cache for Item_func_isnull objects (bug #1990).
item_cmpfunc.h:
  Fixed inconsistency of values of used_tables_cache
  and const_item_cache for Item_func_isnull objects (bug #1990).
 2003-12-01 16:12:05 -08:00
igor@rurik.mysql.com
dcbbbe6b94 join_outer.result, null.result, null.test, item_cmpfunc.h: 
Fixed inconsistency of values of used_tables_cache and
  const_item_cache for Item_func_isnull objects (bug #1990).
 2003-12-01 13:59:09 -08:00
konstantin@oak.local
f35787b628 cleanup: unused variable removed 
followup of Bordeaux Optimizer session
 2003-12-01 20:53:05 +03:00
pem@mysql.comhem.se
3ed561d3cf Post-merge fixes. 2003-12-01 18:24:09 +01:00
konstantin@mysql.com
eb27c16d8b Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/mysql/mysql-4.1-root
 2003-12-01 20:23:46 +03:00
pem@mysql.com
6e717133c5 Merge 4.1 to 5.0 2003-12-01 16:14:40 +01:00
konstantin@oak.local
2d52be9fdf don't delete select_lex->having and select_lex->where as we delete 
all items in free_prep_stmt(free_items);

indentation fix
 2003-12-01 17:46:07 +03:00
monty@mysql.com
f266cdabab Portability fixes (for binary build) 
Added --protocol to mysqlbinlog
 2003-12-01 13:13:16 +02:00
monty@mysql.com
3ee758497f Mark position as # to make test portable 2003-11-28 21:05:53 +02:00
monty@mysql.com
a7610584d6 Merge mysql.com:/my/mysql-4.0 into mysql.com:/my/mysql-4.1 2003-11-28 20:44:26 +02:00
monty@mysql.com
cad6b7c8be rpl_parse and rpl_probe don't have to be reset as they are already 0 2003-11-28 20:41:33 +02:00
monty@mysql.com
2931e100c1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/my/mysql-4.1
 2003-11-28 19:43:30 +02:00
serg@serg.mylan
77d137a24a Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-11-28 18:18:58 +01:00
serg@serg.mylan
d2e065022f "optimization cleanup" reverted - problems on rpl_redirect test. 
It happens that mysql->client_next->client_next=mysql
and mysql_close() goes into infinite loop.
Results vary from simple sigsegv (FreeBSD), to hard system lockup (Linux)
:)
 2003-11-28 18:15:58 +01:00
guilhem@mysql.com
398c8de8fa Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2003-11-28 16:22:45 +01:00
guilhem@mysql.com
c9fd311aac In the slave I/O thread (in master.info), it seems less worse to flush 
the relay log before flushing master.info.
Doing 'before' leads to duplicate event, doing after leads to missing event.
Both can be as destructive, but 'duplicate' enables us to later add detection
code to catch it. Whereas 'missing' can't be caught (it can't, because
the I/O thread can produce legal position jumps, for example if it has
ignored an event coming from this slave (rememember that starting from 4.1.1,
the I/O thread filters the server id).
 2003-11-28 16:15:21 +01:00
konstantin@mysql.com
4e370c333a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/mysql/mysql-4.1-root
 2003-11-28 17:28:48 +03:00
konstantin@oak.local
e149e63334 cleanup: comment moved to proper place 2003-11-28 17:28:04 +03:00
monty@mysql.com
5914033478 merge with 4.0 to get fix for range bug 2003-11-28 15:55:43 +02:00
monty@mysql.com
1976b25dc6 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/my/mysql-4.0
 2003-11-28 15:45:57 +02:00
monty@mysql.com
4f42a47408 Fixed range optimzier bug (Bug #1828) 2003-11-28 15:45:34 +02:00
monty@mysql.com
8e613176b5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/my/mysql-4.1
 2003-11-28 14:47:33 +02:00
monty@mysql.com
320fcb0ef6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/my/mysql-4.1
 2003-11-28 14:23:54 +02:00
serg@serg.mylan
ffb499927c Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-11-28 12:51:15 +01:00
serg@serg.mylan
594f4c35de Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-11-28 12:51:10 +01:00
serg@serg.mylan
3b49d34f97 merged 2003-11-28 12:49:58 +01:00
serg@serg.mylan
16e5b4f0ba bug #1945. item(expression)->name=0, crash in find_item_in_list 2003-11-28 12:36:45 +01:00
monty@mysql.com
7f9466a717 Merge 2003-11-28 13:31:38 +02:00
monty@mysql.com
6a3e29c865 Fix wrong last edit for last commit 2003-11-28 13:15:42 +02:00
monty@mysql.com
ede8169d24 Added missing SSL library (Should be in source distribution) 
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
Added a lot of 'version_xxx' strings to 'show variables'
Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
Fixed problem with printing sub selects to debug log
 2003-11-28 12:18:13 +02:00
konstantin@oak.local
3f6ef8d1ae BK automerge tends to eat break; statements 2003-11-28 13:14:10 +03:00
konstantin@mysql.com
5a4782c360 Merge mysql.com:/home/kostja/mysql/mysql-4.1-root 
into mysql.com:/home/kostja/mysql/mysql-4.1-wl519
 2003-11-28 13:12:16 +03:00
konstantin@oak.local
2e8cf31abc Second part of WL #519: 
Client option secure-auth deployed on all possible layers:
- mysql client command-line and config file option
- mysql_options option MYSQL_SECURE_AUTH
- mysql_real_connect will automatically take into account that option if
  mysql->options.my_cnf_file/my_cnf_group is set
 2003-11-28 13:11:44 +03:00
konstantin@oak.local
38b140fb09 fix: 
2 forgotten 'break;' statements added
 2003-11-28 02:50:58 +03:00
konstantin@mysql.com
faad8c7478 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/kostja/mysql/mysql-4.0-root
 2003-11-28 02:03:57 +03:00
konstantin@mysql.com
3b9eb09276 no need to zero-initialize mysql->master->{rpl_pivot, options.rpl_parse, 
options.rpl_probe} as they are zero-initialized in spawn_init()
 2003-11-28 01:57:05 +03:00
konstantin@mysql.com
48ef39ee65 cleanup: 
no need to set rpl_parse, rpl_probe and rpl_pivot to zero as whole mysql
structure is bzeroed in mysql_init(0) few lines before
 2003-11-28 01:54:34 +03:00
sergefp@mysql.com
82270288de Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0
 2003-11-28 00:34:52 +03:00
sergefp@mysql.com
ae15947360 Fix for bug 1974 2003-11-28 00:31:15 +03:00
bell@sanja.is.com.ua
4014c4eaeb Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
 2003-11-27 19:48:04 +02:00