Commit graph

10296 commits

Author SHA1 Message Date
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 :
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
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
bell@sanja.is.com.ua
bd0aef2df3 code coverage for UNIONs 2003-11-27 19:45:28 +02:00
konstantin@oak.local
d7b021a308 memory leak (no delete for query= new String) fixed 2003-11-27 19:14:16 +03:00
bell@sanja.is.com.ua
9702a4027d removed unused variable 2003-11-27 09:34:41 +02:00
bell@sanja.is.com.ua
ef3b51d52b 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-26 20:13:00 +02:00
bell@sanja.is.com.ua
908bc22217 avoiding coping tmptable_param 2003-11-26 20:12:26 +02:00
konstantin@oak.local
9be8ea49e1 cleanup 2003-11-26 20:23:28 +03:00
konstantin@oak.local
2556abd912 cleanup 2003-11-26 20:18:55 +03:00
bell@sanja.is.com.ua
5a7514643f 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-26 19:13:05 +02:00
bell@sanja.is.com.ua
b633c0ffef avoiding coping tmp_table_param 2003-11-26 19:10:30 +02:00
guilhem@mysql.com
292b0a1892 Fix for BUG#1960 "date_format() returns spurious '-' for valid dates".
It was a forgotten ltime->neg=0 (neg was the only forgotten variable).
I scanned field.cc for other places where we would forget to set neg, found none.
A test for the bug.
2003-11-26 17:06:24 +01:00
lenz@kallisto.local
6549791f21 - fixed compile error in tests/client_test.c
(declarations should be on top of a block)
2003-11-26 15:22:30 +01:00
hf@deer.(none)
3e9338f845 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1-w1284
2003-11-26 13:39:18 +04:00
hf@deer.(none)
611096a709 SCRUM
WL#1284 (warnings about --skip-name-resolve)
Messages corrected
2003-11-26 13:38:32 +04:00
igor@rurik.mysql.com
b99377f3d2 mi_keycache.c:
Removed FLUSH_REMOVE flag (replaced it by FLUSH_RELEASE).
my_sys.h:
  Removed FLUSH_REMOVE flag.
2003-11-25 22:20:31 -08:00
igor@rurik.mysql.com
e54f7400ab mf_keycache.c:
Fixed typo that caused blocking key cache usage after resize.
  Removed wrong re-initialization of resize queue in init_key_cache.
2003-11-25 17:21:43 -08:00
igor@rurik.mysql.com
413f6b2f83 sql_union.cc:
Fixed a bug: missing semicolon.
2003-11-25 15:00:31 -08:00
igor@rurik.mysql.com
66a6f95c47 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2003-11-25 14:33:10 -08:00
igor@rurik.mysql.com
40ff661193 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2003-11-25 14:09:38 -08:00
bell@sanja.is.com.ua
2fb65b4def 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-25 23:56:54 +02:00
bell@sanja.is.com.ua
5474ada47a added collation processing in UNION merging
temporary table BLOB now is longblob
2003-11-25 23:52:10 +02:00
igor@rurik.mysql.com
5eb3763b2f fork_big2.pl:
Added resize key cache test.
2003-11-25 13:06:46 -08:00
igor@rurik.mysql.com
910cd51e59 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-2
2003-11-25 12:00:16 -08:00
heikki@hundin.mysql.fi
dc95a025d6 fil0fil.h, fil0fil.c:
ibbackup --apply-log must be able to rename a table based only on the space id
2003-11-25 21:52:22 +02:00
konstantin@mysql.com
42c4e5cad8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-11-25 22:07:11 +03:00
serg@serg.mylan
34fdd54e07 post-merge fixes 2003-11-25 20:06:41 +01:00
heikki@hundin.mysql.fi
cff81e4b63 Merge heikki@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2003-11-25 20:40:15 +02:00
igor@rurik.mysql.com
f6ca51feff mf_keycache.c, keycache.h:
Fix for the resize key cache operation.
2003-11-25 10:40:14 -08:00
heikki@hundin.mysql.fi
e82a7e2fd2 os0file.h, os0file.c:
Changes needed for ibbackup directory scanning fault tolerance
2003-11-25 20:39:06 +02:00
lenz@mysql.com
53bcfb07d3 Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2003-11-25 19:20:07 +01:00
lenz@mysql.com
8ff4b768ed - Fixed missing node name 2003-11-25 19:19:20 +01:00
lenz@mysql.com
2dd79b37cf Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2003-11-25 19:12:54 +01:00
lenz@mysql.com
ba76560dca - Removed COPYING.LIB from txt_files target in Docs/Makefile.am 2003-11-25 19:11:59 +01:00
serg@serg.mylan
bff0bbeb1f merged 2003-11-25 18:26:53 +01:00
serg@serg.mylan
d975e12477 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-11-25 18:07:42 +01:00
lenz@mysql.com
531eb44301 - Removed COPYING.LIB from all source and binary distributions
after it was removed from manual.texi (where it was automatically
   generated from).
2003-11-25 17:52:12 +01:00
serg@serg.mylan
f8d52f7cf1 a script that fixes anti-GRANT'ness of privilege tables.
It can appear as a result of manual modifications with INSERT/UPDATE/DELETE

This script converts privilege table to the state that could be created
with GRANT commands only (with the exception of the short password)

This is necessary for 5.0
2003-11-25 16:08:55 +01:00
konstantin@oak.local
7c2d0eea45 fix for bug :
"You can always mysql_real_query a query with placeholders 
after mysql_prepare()"
2003-11-25 17:41:12 +03:00
serg@serg.mylan
e267163612 mysql-test-run fixes:
libexec support in install_test_db
--start-from in mysql-test-run
2003-11-25 14:43:15 +01:00
heikki@hundin.mysql.fi
5e6f94f422 dict0boot.c:
Marko's patch: check the position of some system table columns already at C compile time
2003-11-25 15:11:01 +02:00
lenz@mysql.com
12fb40460b - Rephrased two option help texts to not start with "use the ..." as this
confuses RPM's Perl module dependency checking (it adds a bogus
   requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931)
2003-11-24 17:05:24 +01:00
lenz@mysql.com
68690b0380 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2003-11-24 16:02:18 +01:00
serg@serg.mylan
19845c6b1f WL#1172 optimization reverted
(see fulltext.test)
2003-11-24 14:49:03 +01:00
monty@mysql.com
c254bef18e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-11-24 15:04:50 +02:00
jani@rhols221.adsl.netsonic.fi
6c1c262dc1 Fixed Bug#1907, option of type GET_BOOL with arg type OPT_ARG
did not call get_one_option().
2003-11-24 13:25:23 +02:00
jani@rhols221.adsl.netsonic.fi
b137384a38 Fixed Bug#1907, option of type GET_BOOL with arg type OPT_ARG
did not call get_one_option().
2003-11-24 13:25:08 +02:00