knielsen@mysql.com
0e41800311
Fix compile failure, reapply changeset "05/12/29 15:37:36 sergefp@mysql.com"
...
apparently lost in merge.
2006-01-02 13:19:13 +01:00
brian@zim.(none)
f8d1bc8c79
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/slap-5.1
2006-01-02 02:24:38 -08:00
knielsen@mysql.com
dca88abf12
Do not use C++ style comments (//) in C source (breaks compilation on aix52).
2006-01-02 09:58:58 +01:00
brian@zim.(none)
4c9d2ff360
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/slap-5.1
2006-01-01 20:27:24 -08:00
brian@zim.(none)
522a62446c
Cleaned up memory allocation to be a little more staight forward (though I suspect someone will hate my sizeof() increment).
...
Nothing really to see here. Updated comments in code.
More comments are probably needed, but isn't that always the case?
2006-01-01 20:08:45 -08:00
knielsen@mysql.com
62d6f430ee
Do not use C++ style comments (//) in C source (breaks compilation on aix52).
2006-01-02 02:45:26 +01:00
brian@zim.(none)
d4a3fe6e68
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/slap-5.1
2006-01-01 16:47:03 -08:00
brian@zim.(none)
7ce1981bbd
Now uses a single pass testing loop. Dual pass made no sense.
...
Now does averaging when running iterations.
Realligned a bunch of code and continued to remove global variables.
Added CSV output along with printable.
Structures are now provided for print options so adding XML, HTML, ... should now be trivial.
2006-01-01 16:40:02 -08:00
knielsen@mysql.com
9cfa1def8e
Don't use C++ style (//) comments in C source (breaks compilation on aix52).
2006-01-02 01:35:30 +01:00
knielsen@mysql.com
df52ae2abc
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-02 00:38:56 +01:00
knielsen@mysql.com
a51bce1b17
Compile fixes for hpita2.
2006-01-01 23:13:16 +01:00
knielsen@mysql.com
6b2771fe92
Revert error in changeset "1.1979 05/12/22 06:39:02 lars@mysql.com" which
...
caused wrong permissions in "make dist".
2006-01-01 22:57:48 +01:00
knielsen@mysql.com
03e47beb07
Compile fixes for aix52-64bit.
2006-01-01 22:18:02 +01:00
pekka@mysql.com
afbbaa9794
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/export/space/pekka/ndb/version/my51
2006-01-01 21:50:29 +01:00
pekka@mysql.com
e469d5fc85
ndb - wl#2972 (5.1) fix detached trigger opType
2006-01-01 21:48:26 +01:00
serg@serg.mylan
ff6507c946
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2005-12-31 10:16:19 +01:00
serg@serg.mylan
850391e6c5
libarchive.a and storage/archive/Makefile should be specified in
...
MYSQL_STORAGE_ENGINE macro (and nowhere else)
2005-12-31 10:13:45 +01:00
bar@mysql.com
dc1b2cd312
Making old tables seen with "#mysql50#" prefix,
...
which makes it possible to run RENAME TABLE
on old tables when upgrading from 5.0.
TODO: A stored procedure to rename all tables and
databases with old name format into new format,
it will simplify upgrade.
sql_table.cc:
Making old tables seen with "#mysql50#" prefix.
Adding warning into .err log when an old name is found.
sql_show.cc:
Skip non-directories before filename_to_tablename
call, to avoid unnecessary warnings.
strfunc.cc:
Adding "error" argument to strconvert()
mysql_priv.h:
Adding "error" agrument to strconvert()
2005-12-31 12:34:39 +04:00
bar@mysql.com
ce1f07078e
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.fscs3
2005-12-31 09:02:56 +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
patg@govinda.site
1abafd6338
New amd64 no-ndb build script.
2005-12-30 08:06:00 -08:00
svoj@april.(none)
78845aba37
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into april.(none):/home/svoj/devel/mysql/mysql-5.1-new
2005-12-30 16:32:32 +04:00
svoj@april.(none)
a1e8e4cee9
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into april.(none):/home/svoj/devel/mysql/mysql-5.1-new
2005-12-30 15:07:54 +04:00
bar@mysql.com
83d8979ca2
backup.result, backup.test:
...
t4 was not dropped, which made the "backup" test fail
if one of the previous tests using t4 (e.g. "archive") failed.
2005-12-30 14:55:56 +04:00
joerg@mysql.com
e97f38b2d8
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/M51/mysql-5.1
2005-12-29 22:37:58 +01:00
serg@serg.mylan
a2689bae45
after pull fixes
2005-12-29 21:29:02 +01:00
joerg@mysql.com
be217374a0
Merge mysql.com:/M50/upward-5.0 into mysql.com:/M51/merge-5.1
2005-12-29 19:11:36 +01:00
svoj@april.(none)
c0c5b1ac84
BUG#16068: Plugin related bugs
...
Fixed that --plugin_dir option doesn't work.
Fixed that parser name is not restored correctly from the table.
2005-12-29 17:28:59 +04:00
ingo@mysql.com
49e294de70
Merge mysql.com:/home/mydev/mysql-5.0-bug15591
...
into mysql.com:/home/mydev/mysql-5.1-bug15591
2005-12-29 13:37:37 +01:00
sergefp@mysql.com
a590401007
Fix the compile failure introduced by the previous cset.
2005-12-29 15:37:36 +03:00
brian@zim.(none)
ad071bec57
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/slap-5.1
2005-12-28 19:40:24 -08:00
brian@zim.(none)
f5563028d3
Added option --lock-directory so that you can now syncronize several mysqlslap processes across several machines. Not perfect yet.
...
Added --slave option if you are trying to syncronize around one server using the lock-directory option plus NFS.
Added options to allow you to run several concurrency runs in one call. aka --concurrency="1, 8, 64, 128"
Time collection is now done in a finer grain manner, and is linked to the sync call (doesn't count the cost of the blocked processes that are setup to run).
2005-12-28 18:41:06 -08:00
msvensson@devsrv-b.mysql.com
0583507f88
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15775_part2/my51-bug15775_part2
...
into devsrv-b.mysql.com:/space/magnus/my51-bug15775_part2
2005-12-28 23:28:45 +01:00
ingo@mysql.com
b1214d232e
Bug#15591 Occasional test suite abort due to port in use
...
If the server is started with --port-open-timeout=#
retry to bind the TCP port if it fails with EADDRINUSE.
Use the new option in mysql-test-run.sh.
2005-12-28 20:30:57 +01:00
evgen@moonbone.local
5a3ce237af
Merge moonbone.local:/work/14583-bug-5.0-mysql
...
into moonbone.local:/work/14583-bug-5.1-new-mysql
2005-12-28 19:47:56 +03:00
evgen@moonbone.local
45abf0dabd
Manual merge
2005-12-28 17:23:08 +03:00
msvensson@neptunus.(none)
6717a17fe7
Merge neptunus.(none):/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2
...
into neptunus.(none):/home/msvensson/mysql/bug15775_part2/my51-bug15775_part2
2005-12-28 14:46:00 +01:00
msvensson@neptunus.(none)
e1ef24e38c
Bug #15775 "drop user" command does not refresh acl_check_hosts
...
- Update patch for 5.0
- Added common function to be called when 'acl_users' has been modified
2005-12-28 14:43:50 +01:00
evgen@moonbone.local
535b23bec5
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/14583-bug-4.1-mysql
2005-12-28 16:00:10 +03:00
svoj@mysql.com
a3f445151f
WL#2575 - Fulltext: Parser plugin for FTS
...
Manual merge.
2005-12-28 16:05:30 +04:00
msvensson@neptunus.(none)
cdd1f5c6fc
Merge neptunus.(none):/home/msvensson/mysql/bug15775_part2/my41-bug15775_part2
...
into neptunus.(none):/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2
2005-12-28 09:31:40 +01:00
msvensson@neptunus.(none)
2fb6cb5a5a
BUG#15775 "drop user" command does not refresh acl_check_hosts
...
- DROP USER command didn't reload the acl_check_hosts cache causing subsequent
connect's via TCP to fail randomly.
- 4.1 version
2005-12-28 09:23:27 +01:00
ingo@mysql.com
eecf49999d
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug5390
2005-12-28 09:18:57 +01:00
stewart@mysql.com
70cc1a08af
build fixes for azio on systems without zutil.h
2005-12-28 15:33:48 +11: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
acurtis@xiphis.org
986cd20a0f
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into xiphis.org:/home/antony/work2/p4-bug15976
2005-12-27 11:15:56 -08:00
ingo@mysql.com
bd1b724bbf
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug5390
2005-12-27 19:25:54 +01:00
pekka@mysql.com
76bdccd08a
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/pekka/ndb/version/my50
2005-12-27 18:56:33 +01:00
pekka@mysql.com
79c7b62a55
ndb - post merge fix
2005-12-27 18:47:56 +01:00
pekka@mysql.com
56351ff012
Merge mysql.com:/space/pekka/ndb/version/my50
...
into mysql.com:/space/pekka/ndb/version/my51
2005-12-27 18:28:55 +01:00