dlenev@mysql.com
15c86158a7
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg14836
...
into mysql.com:/home/dlenev/src/mysql-5.1-merges
2005-12-24 20:13:51 +03:00
brian@zim.(none)
795f744c5f
Just a few cleanup points in azio. Should solve Ubuntu compile problem.
2005-12-23 17:51:14 -08:00
brian@zim.(none)
a580f985ec
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/archive-5.1
2005-12-23 12:25:56 -08:00
brian@zim.(none)
56fd453c5d
Fix for Antony's push. I've also changed from using the zlib off_t pointer type to my_off_t to fix issues around buggy zlib versions and to make sure file sizes are consistent through out mysql.
2005-12-23 12:22:31 -08:00
joerg@mysql.com
01d0454109
storage/bdb/dist/s_all
...
When not generating 'tags' file, also don't generate symlinks to it (or make dist will fail/behave wierdly).
(origin: 1.1985 05/12/22 23:31:15 knielsen@mysql.com +1 -0)
2005-12-23 12:46:48 +01:00
brian@zim.(none)
f86fd78261
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/archive-5.1
2005-12-22 20:06:05 -08:00
brian@zim.(none)
3ee76a3e3c
Update to add in support for AZIO.
...
AZIO differs in that it uses mysys methods and removes all of the malloc calls.
2005-12-22 19:50:10 -08:00
brian@zim.(none)
680762498a
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/cluster-5.1
2005-12-22 10:39:41 -08:00
mats@mysql.com
2754e14d40
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b15920-mysql-5.1-new
2005-12-22 16:38:32 +01:00
knielsen@mysql.com
5e35d7f435
WL#1012 Add to sql/Makefile.am include files forgotten in RBR push.
...
Remove errorneously committed ChangeLog file.
2005-12-22 14:32:54 +01:00
knielsen@mysql.com
d4c6aff386
Cleanup "make dist" and Windows builds after push of pluggable storage engines.
2005-12-22 13:18:06 +01:00
mats@mysql.com
6dd5e5619e
Bug#15920 (Temporary tables are not logged in binlog):
...
Fixing faulty tests preventing some CREATE TEMPORARY TABLE statements
from being binlogged under statement-based replication.
2005-12-22 11:09:50 +01:00
brian@zim.(none)
3c23f4dca9
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/cluster-5.1
2005-12-22 01:12:40 -08:00
brian@zim.(none)
fe7ecfd5f1
This patch does the following:
...
1) Fixes breakage in embedded server build for XMLPath push.
2) Hides PARTITION engine from view.
3) Add ENGINES information schema (and it should now be clear from this patch on how to turn any show command into an information schema).
2005-12-22 01:07:47 -08:00
knielsen@mysql.com
7b8fa1e3c6
Fix compile problem in ha_example.cc
2005-12-22 09:19:24 +01:00
lars@mysql.com
4eee14fb70
WL#1012 Missed option file
2005-12-22 07:49:19 +01:00
lars@mysql.com
ad126d90e0
WL#1012: All changes as one single changeset.
...
This includes both code and test cases.
2005-12-22 06:39:02 +01:00
acurtis@xiphis.org
0f8f444b8b
Change for plugin storage engine to be built after mysqld
2005-12-21 14:58:03 -08:00
acurtis@xiphis.org
e2870b24c6
Fix for plugins work
2005-12-21 14:03:57 -08:00
acurtis@xiphis.org
9e3a6897c9
plugin version changes
2005-12-21 12:50:50 -08:00
acurtis@xiphis.org
9d4d1e81b8
Merge xiphis.org:/home/antony/work2/mysql-5.1
...
into xiphis.org:/home/antony/work3/mysql-5.1-plugable-2
2005-12-21 10:26:39 -08:00
acurtis@xiphis.org
13a776778c
Finalize storage engine plugins
...
Give BerkeleyDB savepoints
Remove "enum db_type" from most of the code
2005-12-21 10:18:40 -08:00
joerg@mysql.com
bb1b1a28a6
Raise the version number.
2005-12-21 16:09:12 +01:00
bar@mysql.com
5f91dd6fad
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.xml
2005-12-21 17:14:58 +04:00
bar@mysql.com
519f9d628c
Adding XPath support: ExtractValue and UpdateXML functions.
...
libmysqld/Makefile.am:
sql/Makefile.am:
Adding new source files.
Adding new file into build process.
include/my_xml.h:
strings/xml.c:
Adding new XML parse flags to skip text normalization and
to use relative tag names. Adding enum for XML token types.
sql/lex.h:
Making parser aware of new SQL functions.
sqll/item_create.h, sql/item_create.cc:
Adding creators for ExtractValue and UpdateXML.
sql/item.h:
Adding new Item types: nodeset and nodeset comparator.
sql/item_xmlfunc.h
sql/item_xmlfunc.cc
Adding new classes implementing XPath functions.
mysql-test/t/xml.test, mysql-test/r/xml.result:
New files: adding test case
2005-12-21 17:13:52 +04:00
dlenev@mysql.com
74ca27b305
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg14836
2005-12-21 15:02:34 +03:00
vtkachenko@melody.mysql.com
d1b5981693
Merge bk-internal:/home/bk/mysql-5.1-new
...
into melody.mysql.com:/home/vadim/mysql-5.1-new
2005-12-21 09:07:06 +01:00
kent@mysql.com
17f293fd97
mysql-test-run.pl:
...
Don't run "mysqlslap" on Windows
mysqlslap.test:
We don't run "mysqlslap" on Windows
mysql.sln:
Removed build of "client/mysqlslap.c" on Windows
2005-12-21 06:02:04 +01:00
kent@mysql.com
16bf0baf1d
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2005-12-21 06:02:03 +01:00
pappa@c-910be253.1238-1-64736c10.cust.bredbandsbolaget.se
cf61fa2f26
Minor portability issue on big endian boxes
2005-12-21 00:02:02 -05:00
msvensson@neptunus.(none)
7100dec8fe
BUG#15981 Current 5.1 fails for NDB tests
2005-12-20 20:53:29 +01:00
paul@snake-hub.snake.net
5a222bcf72
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2005-12-20 12:43:51 -06:00
paul@snake-hub.snake.net
1b106bf4fc
errmsg.txt:
...
Fix typo.
2005-12-20 12:42:35 -06:00
vtkachenko@melody.mysql.com
22c930c924
Fast mutexes implementation
...
(spin-loop inside pthread_mutex_lock).
thr_mutex.c:
Added spinloop in mutex_lock
my_pthread.h:
Added definition of my_pthread_fastmutex_t
configure.in:
Added --with-fast-mutexes switch
2005-12-20 14:56:45 +01:00
msvensson@neptunus.(none)
a26ae25ee6
Bug #15483 mysqlslap client fails in mysqlslap test.
2005-12-20 12:57:51 +01:00
msvensson@neptunus.(none)
b93eb20928
Bug #15845 New file "client/mysqlslap.c" break compilation on QNX, missing "sys/shm.h"
2005-12-20 12:56:48 +01:00
msvensson@neptunus.(none)
e50c0fdc3b
Bug #15772 Aborted YaSSL connections force threads into busyloops
...
- Report error when there is nothing to read after wait.
2005-12-20 00:47:50 +01:00
kent@mysql.com
6e276f03be
my_sys.h:
...
Added MAP_NORESERVE set to 0 for Windows
config-win.h:
If MAX_INDEXES is not set, set it to 64 on Windows
2005-12-19 23:23:53 +01:00
paul@snake-hub.snake.net
69558344c5
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2005-12-19 11:38:55 -06:00
kent@mysql.com
60a0d94733
sql_trigger.cc, item.cc:
...
BUG#15842: Change in "item.cc" adding Item_sp_variable breaks compile on HP-UX 11.23
Fix: make explicit conversion to non-constant string (char *)
(change by anozdrin@mysql.com )
2005-12-19 17:36:20 +01:00
kent@mysql.com
b898368a93
my_global.h:
...
Fix for bug #15841 : Change in sql_map.cc and mmap breaks on HP-UX
- in order to enable the mmap64() (and others) define
_LARGEFILE64_SOURCE in case of _LARGEFILE_SOURCE defined on HPUX.
2005-12-19 17:00:53 +01: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
gluh@eagle.intranet.mysql.r18.ru
f9ef0df0d3
Fix for bug#14271 I_S: columns has no size for (var)binary columns
...
set character_octet_length, character_maximum_length for
binary and varbinary field types
2005-12-19 16:21:02 +04:00
gluh@eagle.intranet.mysql.r18.ru
f4b052844f
Fix for bug#14861 aliased column names are not preserved.
...
Create tmp table filed using original item name when it's necessary
2005-12-19 15:36:03 +04:00
gluh@eagle.intranet.mysql.r18.ru
c8631b414b
Bug#12770 DESC cannot display the info. about temporary table
...
Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
Bug#15224 SHOW INDEX from temporary table doesn't work.
Restore thd->temporary_tables to be able to process
temporary tables(only for 'show index' & 'show columns').
This should be changed when processing of temporary tables for
I_S tables will be done.
2005-12-19 14:46:54 +04:00
joerg@mysql.com
df0358c4cc
mysql-test/t/federated_transactions.test
...
Fix a typo: Trailing ";" for "source" command.
2005-12-19 11:12:53 +01:00
stewart@mysql.com
50e3a9cdb3
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/cleanup
2005-12-19 19:01:20 +11:00
hartmut@mysql.com
7244dfd8d2
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.1
2005-12-19 08:33:27 +01:00
kent@mysql.com
193af1c352
federated_transactions.test:
...
Test require Berkeley DB
2005-12-19 04:05:48 +01:00
kent@mysql.com
d4ffa597a2
Merge
2005-12-19 03:49:02 +01:00