serg@serg.mylan
48b8e842ca
Automerge
2006-02-15 00:01:46 +01:00
serg@serg.mylan
63cfd11859
dbug changes:
...
1. dbug state is now local to a thread
2. new macros: DBUG_EXPLAIN, DBUG_EXPLAIN_INITIAL,
DBUG_SET, DBUG_SET_INITIAL, DBUG_EVALUATE, DBUG_EVALUATE_IF
3. macros are do{}while(0) wrapped
4. incremental modifications to the dbug state (e.g. "+d,info:-t")
5. dbug code cleanup, style fixes
6. _db_on_ and DEBUGGER_ON/OFF removed
7. rest of MySQL code fixed because of 3 (missing ;) and 6
8. dbug manual updated
9. server variable @@debug (global and local) to control dbug from SQL!
a. -#T to print timestamps in the log
2006-02-14 22:36:11 +01:00
svoj@april.(none)
7e8b145b94
BUG#17117: header fille "plugin.h" does not have a namespace prefix
...
plugin.h has been moved into include/mysql/plugin.h
2006-02-14 13:51:25 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
d955abd292
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2006-02-05 11:06:29 +02:00
konstantin@mysql.com
9f0bb47f87
Merge mysql.com:/home/kostja/mysql/tmp_merge
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 23:27:06 +03:00
jani@ua141d10.elisa.omakaista.fi
2dcc483e6c
Several Netware specific fixes.
2006-02-02 16:22:31 +02:00
konstantin@mysql.com
92b41ba92a
Merge mysql.com:/home/kostja/mysql/tmp_merge
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 16:57:34 +03:00
svoj@april.(none)
a718127744
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into april.(none):/home/svoj/devel/mysql/BUG16722/mysql-5.1-new
2006-01-30 16:28:51 +04:00
svoj@april.(none)
4a1bda39ef
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into april.(none):/home/svoj/devel/mysql/BUG16722/mysql-5.1-new
2006-01-26 15:23:08 +04:00
svoj@april.(none)
714cf5688b
BUG#16722 - Fulltext: implicit limit for query word number (depends on length of the query)
...
Remove implicit limit for query word number.
2006-01-26 15:12:59 +04:00
serg@serg.mylan
cbd98c01cf
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-26 09:51:24 +01:00
brian@zim.tangent.org
570bffe8c7
Rename of my_strdup_with_lenght to match the more common "strndup" method. Soo its now my_strndup().
...
my_stat() gettinng the correct parameter list may be next :)
2006-01-25 19:54:42 -08:00
serg@serg.mylan
442e328ee9
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-17 18:35:13 +01:00
serg@serg.mylan
5b9b3ccb4c
only use "public" types in plugin API
2006-01-16 15:17:45 +01:00
svoj@april.(none)
4426d2ea30
BUG#14194: Problem with fulltext boolean search and apostrophe
...
Fixed that single apostrophe was considered as a word character.
2006-01-13 23:34:38 +04:00
bar@mysql.com
6ff211329f
WL#1324 table name to file name encoding
...
- Encoding itself, implemented as a charset
"filename". Originally planned to use '.'
as an escape character, but now changed to '@'
for two reasons: "ls" does not return
file names starting with '.' considering them
as a kind of hidden files; some platforms
do not allow several dots in a file name.
- replacing many calls of my_snprintf() and
strnxmov() to the new build_table_filename().
- Adding MY_APPEND_EXT mysys flag, to append
an extention rather that replace it.
- Replacing all numeric constants in fn_format
flag arguments to their mysys definitions, e.g.
MY_UNPACK_FILENAME,
- Predictability in several function/methods:
when a table name can appear with or withot .frm
extension. Some functions/methods were changed
so accept names strictly with .frm, other - strictly
without .frm extensions. Several DBUG_ASSERTs were
added to check whether an extension is passed.
Many files:
table name to file name encoding
mysql_priv.h:
Prototypes for new table name encoding tools.
ctype-utf8.c:
Implementing "filename" charset for
table name to file name encoding.
row0mysql.c:
Fixing table name prefix.
mf_format.c:
Adding MY_APPEND_EXT processing.
Many files:
Fixing tests.
my_sys.h:
Adding new flag to append rather than replace an extension.
m_ctype.h:
Adding "filename" charset definition.
2005-12-31 09:01:26 +04:00
svoj@mysql.com
a3f445151f
WL#2575 - Fulltext: Parser plugin for FTS
...
Manual merge.
2005-12-28 16:05:30 +04:00
stewart@mysql.com
cac298e07b
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
...
into mysql.com:/home/stewart/Documents/MySQL/5.1/new
2005-12-28 13:55:59 +11:00
vtkachenko@quadxeon.mysql.com
e9282ff3d0
Bug fix for bug #15843 "Added mmap support in myisam creates compile problem
...
on AIX 5.2"
Added dummy definition of MAP_NORESERVE for systems which doesn't provide it,
removed duplicates
my_sys.h:
added definition for MAP_NORESERVE
(for Irix and AIX systems)
sql_map.cc:
removed definition of MAP_NORESERVE
mi_packrec.c:
removed definition of MAP_NORESERVE and MMAP_PRIVATE
2005-12-19 14:16:21 +01:00
vtkachenko@quadxeon.mysql.com
c1854e67f0
Merge bk-internal:/home/bk/mysql-5.1-new
...
into quadxeon.mysql.com:/benchmarks/ext3/BUILDS/mysql-5.1-new
2005-12-02 12:02:38 +01:00
SergeyV@selena.
29941c07ed
Merge selena.:H:/MYSQL/bkt/mysql-5.0
...
into selena.:H:/MYSQL/bkt/mysql-5.1
2005-12-01 23:47:44 +03:00
vtkachenko@quadxeon.mysql.com
045747f23d
Many files:
...
Added mmap support for MyISAM engine
2005-12-01 13:34:48 +01:00
pem@mysql.com
b2a9961abf
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/mysql-5.1-new
2005-11-28 20:14:12 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-11-23 14:57:00 +02:00
guilhem@mysql.com
24006266d0
Merge mysql.com:/home/mysql_src/mysql-5.0-van
...
into mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
(2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).
2005-11-19 10:43:28 +01:00
svoj@poseidon.ndb.mysql.com
3791197f0d
WL#2575 - Fulltext: Parser plugin for FTS
...
WL#2763 - MySQL plugin interface: step 1
Manual merge from CNET tree.
2005-11-06 13:13:06 +01:00
monty@mysql.com
a6f5375cb0
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2005-11-05 01:32:55 +02:00
serg@serg.mylan
2e2d18b7cf
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2005-10-09 19:10:19 +02:00
tomas@poseidon.ndb.mysql.com
620b7bafb0
Merge
2005-10-06 10:54:07 +02:00
msvensson@neptunus.(none)
10eee79363
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-09-15 11:32:49 +02:00
ndbdev@dl145c.mysql.com
f40c1576b0
Merge
2005-09-06 09:20:15 +02:00
msvensson@neptunus.(none)
345dfef41f
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-09-02 08:59:59 +02:00
ndbdev@dl145b.mysql.com
583979d949
merge
2005-08-31 20:45:48 +02:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
02056f8e3a
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-25 13:11:38 -04:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
69acde961f
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-05 18:01:34 -04:00
ndbdev@dl145b.mysql.com
f5f56e4995
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-21 16:49:03 +02:00
tulin@dl145b.mysql.com
a6c21a0791
merge
2005-07-19 21:56:10 +02:00
tomas@poseidon.ndb.mysql.com
674b6bb151
Merge
2005-07-12 20:01:22 +02:00
svoj@mysql.com
e98959dfbe
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/WL2535-mysql-5.1
2005-06-28 16:07:16 +05:00
tulin@dl145b.mysql.com
566e9ec32a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-21 07:52:33 +02:00
joreland@mysql.com
84a04b4a9d
merge
2005-06-13 14:09:09 +02:00
joreland@mysql.com
54cff2bc30
merge
2005-06-13 08:05:29 +02:00
svoj@mysql.com
1e75a266b3
Merge mysql.com:/mnt/archive/svoj/mysql/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/WL2535-mysql-5.1
2005-06-07 21:56:13 +05:00
ndbdev@dl145b.mysql.com
161a58ab4b
merge
2005-06-06 23:39:19 +02:00
svoj@mysql.com
5193b4ec70
WL#2535 - smarter "index merge" in fulltext
2005-05-27 00:43:40 +05:00
ndbdev@dl145c.mysql.com
30def9f3f8
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-05-23 10:45:48 +02:00
tulin@dl145c.mysql.com
be861a7ccf
merge
2005-05-19 09:04:24 +02:00
tulin@dl145c.mysql.com
23f79bd1f2
merge
2005-05-17 10:17:53 +02:00
tomas@poseidon.ndb.mysql.com
145ae3c6f5
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
2005-05-02 13:18:26 +02:00
brian@zim.(none)
3e4607a3b8
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/mysql-5.1
2005-04-26 19:07:13 -07:00
brian@zim.(none)
2a7c71e309
Changes to create storage directory for storage engines.
2005-04-26 18:19:54 -07:00