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
stewart@mysql.com
29454a64ed
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
...
into mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup
2005-12-21 12:44:26 +11: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
f5cc3fd619
mysql.cc:
...
Typo in help message.
2005-12-20 12:47:44 -06: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
ingo@mysql.com
b0e84cb999
BUG#5390 - problems with merge tables
...
Problem #1 : INSERT...SELECT, Version for 5.0.
Extended the unique table check by a check of lock data.
Merge sub-tables cannot be detected by doing name checks only.
2005-12-20 16:35:05 +01: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
stewart@mysql.com
7d6f1e4709
build fix
2005-12-21 00:18:58 +11: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
ffab9e11b5
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
...
into mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup
2005-12-19 19:06:12 +11: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
stewart@mysql.com
13a32f8808
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
...
into mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup
2005-12-19 19:00:17 +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
kent@mysql.com
f2b1e40383
mysql-test-run.pl:
...
Script "my_print_defaults" is to be searched for as executable
2005-12-19 03:39:25 +01:00
kent@mysql.com
575b00a110
disabled.def:
...
Disabled 'type_time' until 15805 is closed
2005-12-19 03:05:26 +01:00
kent@mysql.com
2205d1b8d5
mysql.spec.sh, make_binary_distribution.sh, Makefile.am, mysql.sln:
...
Added "client/mysqlslap"
mysqlslap.vcproj, mysqlslap.def:
new file
2005-12-19 01:12:11 +01:00
paul@snake-hub.snake.net
f1e336acac
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-18 16:12:18 -06:00
serg@serg.mylan
f4d3a85aaa
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-12-18 18:27:34 +01:00
kent@mysql.com
c1a52878fe
Merge
2005-12-18 18:11:19 +01:00
kent@mysql.com
63b4ce720a
Merge
2005-12-18 15:26:37 +01:00
kent@mysql.com
16d66d2a1e
Makefile.am:
...
Added 5.0 specific build scripts
2005-12-18 15:07:58 +01:00
kent@mysql.com
9a0f262ebf
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-18 15:02:13 +01:00
kent@mysql.com
943f34f39b
Merge
2005-12-18 14:55:05 +01:00
kent@mysql.com
d3b64781e1
Makefile.am:
...
Adjusted listing of files to put into source TAR
2005-12-18 14:51:19 +01:00
serg@serg.mylan
c23612247c
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-12-18 13:31:43 +01:00
serg@serg.mylan
297d80dc11
BUG#11336 - fulltext index corruption after repair_by_sort and mi_delete
...
for uca collation isalnum and strnncollsp don't agree on whether
0xC2A0 is a space (strnncollsp is right, isalnum is wrong).
they still don't, the bug was fixed by avoiding strnncollsp
2005-12-18 13:30:01 +01:00
kent@mysql.com
0c3f7afd6b
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-12-17 04:22:16 +01:00
jimw@mysql.com
32c76f4b6a
Merge mysql.com:/home/jimw/my/mysql-5.1-14809
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2005-12-16 14:31:27 -08:00
ranger@regul.home.lan
29f44a8c77
Fixed default values for counters to 0
2005-12-16 22:53:10 +02:00
ranger@regul.home.lan
f8b2e7c5eb
Merge alstroganov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into regul.home.lan:/mnt/md/bk/mysql-5.0
2005-12-16 22:15:53 +02:00
paul@snake-hub.snake.net
223b7fa131
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-16 10:44:50 -06:00
joerg@mysql.com
ca033879c9
Merge mysql.com:/M51/try-5.1-extra into mysql.com:/M51/mysql-5.1
2005-12-16 12:47:14 +01:00
joerg@mysql.com
6eb8bf620b
storage/innobase/Makefile.am :
...
Restore "make dist" for the header files in "storage/innobase/include".
2005-12-16 12:45:43 +01:00