Commit graph

439 commits

Author SHA1 Message Date
bell@sanja.is.com.ua
e025adb403 Merge 2003-11-03 08:47:27 +02:00
monty@mysql.com
cf535556c6 Cleanups (comments and compiler warnings)
dded init of variable to fix core dump on startup errors
2003-11-02 14:00:25 +02:00
bell@sanja.is.com.ua
0747324ede merge 2003-10-31 22:14:49 +02:00
serg@serg.mylan
74551a72ec Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-10-31 10:34:34 +01:00
igor@rurik.mysql.com
f29ed57531 Merge 2003-10-30 10:45:28 -08:00
bell@sanja.is.com.ua
ae380c5855 merge 2003-10-28 12:45:37 +02:00
serg@serg.mylan
8cdc27da15 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-10-25 00:03:44 +02:00
serg@serg.mylan
6e17f4f20d fixes to Bitmap class 2003-10-24 22:44:48 +02:00
serg@serg.mylan
944570970d Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-10-23 23:11:33 +02:00
bell@sanja.is.com.ua
faea7e0144 Merge 2003-10-23 21:26:06 +03:00
bell@sanja.is.com.ua
934fa2a104 Merge 2003-10-22 20:52:47 +03:00
hf@deer.(none)
2918e5d529 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2003-10-21 16:06:26 +05:00
hf@deer.(none)
b04af44923 Fix for Windows bug reported throuhg Miguel 2003-10-21 16:05:17 +05:00
serg@serg.mylan
f944fd4a65 merged 2003-10-21 11:58:43 +02:00
gluh@gluh.mysql.r18.ru
4bed4abb62 Merge commit 2003-10-20 13:45:28 +05:00
gluh@gluh.mysql.r18.ru
62b0b8b800 Scrum task 835 - text-to-datetime conversion function 2003-10-20 13:24:18 +05:00
serg@serg.mylan
4aa99ff7b1 fixes for new key_map code 2003-10-16 21:21:48 +02:00
bell@sanja.is.com.ua
a7bdd19707 subqueries made printable
new EXPLAIN parameter to show real query as it was interpreted
(SCRUM) (WL#1274)
2003-10-16 15:54:47 +03:00
monty@mashka.mysql.fi
0d34e50f39 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2003-10-15 22:52:31 +03:00
monty@mashka.mysql.fi
9ef2a83fbe Portability fixes for windows
After merge fixes
2003-10-15 22:40:36 +03:00
serg@serg.mylan
50d9b95b77 merged 2003-10-15 12:25:44 +02:00
gluh@gluh.mysql.r18.ru
9c2867c2d4 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.max
2003-10-15 14:51:56 +05:00
gluh@gluh.mysql.r18.ru
9e401712a0 WL#1106: Switch = --maxdb rather than --sapdb 2003-10-15 14:50:36 +05:00
monty@mashka.mysql.fi
461d1627b3 merge with 4.0 for more memory allocation variables. 2003-10-13 15:50:30 +03:00
heikki@hundin.mysql.fi
5ec87f2449 Many files:
ALTER TABLE ... DISCARD/IMPORT TABLESPACE
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
2003-10-13 11:20:19 +03:00
monty@mashka.mysql.fi
c95d142f8f Add new user variables for tuning memory usage:
query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
Add more checks for "out of memory" detection in range optimization
2003-10-11 22:00:24 +03:00
serg@serg.mylan
8cc3951c8f key_map with more that 64 bits width 2003-10-11 13:06:55 +02:00
bell@laptop.sanja.is.com.ua
200eb65df7 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1
2003-10-09 09:30:26 +03:00
monty@narttu.mysql.fi
9e57c12b5a Fixed bug in error handling of CREATE ... SELECT
More tests cases
After merge fixes
2003-10-08 18:53:31 +03:00
bell@laptop.sanja.is.com.ua
afac13d033 Some simple optimisation
= ANY and <> ALL converted to (NOT) IN to get advantage of IN optimisation
2003-10-08 17:40:54 +03:00
monty@narttu.mysql.fi
6056cfadfc Merge with 4.0.16 2003-10-07 15:42:26 +03:00
bell@laptop.sanja.is.com.ua
5b13ec47dd Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1
2003-10-07 02:20:23 +03:00
monty@mishka.mysql.fi
53fa223ed6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.mysql.fi:/home/my/mysql-4.1
2003-10-06 22:57:04 +03:00
bell@laptop.sanja.is.com.ua
e1b53fdd42 Merge 2003-10-06 20:55:06 +03:00
bar@bar.mysql.r18.ru
67347790de sql_cache.cc, mysql_priv.h:
Query cache now takes in account character_set_results and collation_connection
2003-10-03 17:09:54 +05:00
monty@mishka.mysql.fi
0d21572d01 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.mysql.fi:/home/my/mysql-4.1
2003-10-03 02:08:49 +03:00
bell@laptop.sanja.is.com.ua
d360ddc0b2 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-qc_struct-4.1
2003-10-02 12:18:34 +03:00
bell@laptop.sanja.is.com.ua
c3ab43b3f0 Structure for storing parameters of query in query cache (asked by Bar) 2003-10-02 12:02:05 +03:00
igor@rurik.mysql.com
f17ff0bc39 Many files:
Fix after manual merge
2003-10-01 23:37:05 -07:00
igor@rurik.mysql.com
f12cbd4bb8 Manual merge after improving concurrency for key cache reassignment 2003-10-01 20:20:17 -07:00
monty@mishka.mysql.fi
a5d9c195d3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.mysql.fi:/home/my/mysql-4.1
2003-09-29 22:06:49 +03:00
monty@mishka.mysql.fi
9210e8729a Add missing define (after merge) 2003-09-29 22:06:31 +03:00
lenz@mysql.com
9b8b92faff - enable changing the number of table bits for JOINs to be increased
from ulong to ulonglong by defining -DBIG_JOINS
2003-09-29 12:01:10 +02:00
hf@deer.(none)
7f542f3e33 SCRUM
WL#604 Privileges in embedded library
bugs fixed
2003-09-29 11:47:37 +05:00
hf@deer.(none)
5f8e7fef27 Merge 2003-09-26 15:40:26 +05:00
hf@deer.(none)
ba8fa76fa2 SCRUM:
WL#604 Privileges in embedded library
code added to check privileges in embedded library
NO_EMBEDDED_ACCESS_CHECKS macros inserted in code so we can exclude
access-checking parts. Actually we now can exclude these parts from
standalone server as well. Do we need it?
Access checks are disabled in embedded server by default. One should
edit libmysqld/Makefile manually to get this working.
We definitely need the separate configure for embedded server
2003-09-26 15:33:13 +05:00
hf@deer.(none)
192fcb9cc6 Bug fixed
null_string wasn't known in libmysqld/lib_sql.cc, that caused compiler's error
i put the declaration of the null_string in mysql_priv.h and renamed it
to my_null_string to reduce the probability of name's intersections
2003-09-25 13:02:45 +05:00
monty@mishka.mysql.fi
c22c1d8a4d merge 2003-09-24 10:24:56 +03:00
hf@deer.(none)
e89e3ff753 SCRUM
embedded library
some dirty places cleaned:

uint removed from mysql.h as Miguel suggested
empty_string renamed as my_empty_string to get rid of name's intersections
using embedded library
2003-09-18 18:58:02 +05:00
hf@deer.(none)
ddbca4176d SCRUM:
prepared statements in embedded library
2003-09-17 20:48:53 +05:00