brian@zim.(none)
939f80be2e
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/cluster-5.1
2005-12-24 15:43:22 -08:00
brian@zim.(none)
dcbe5acb1b
See message in mysqlslap.c, but basically
...
1) Parsing now works
2) Options are safer, aka it doesn't kill the machine and it cleans up after itself
3) Option of --only-print added so that you can see what it does.
4) Tiny cleanup of the auto generate sql. A lot more needs to be done with this, for it to be very valuable. I suspect it doesn't work all that well.
5) Delimeter is now a single character. No good escaping going on.
6) You can now change which schema it is runninng against.
Now I think I can go make use of it!
Though I need to add support for a "only run this many inserts, divide by the number of clients connecting, to really test scaling"
2005-12-24 15:41:40 -08:00
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)
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
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
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
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
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
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
msvensson@neptunus.(none)
a26ae25ee6
Bug #15483 mysqlslap client fails in mysqlslap test.
2005-12-20 12:57:51 +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
kent@mysql.com
193af1c352
federated_transactions.test:
...
Test require Berkeley DB
2005-12-19 04:05:48 +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
c1a52878fe
Merge
2005-12-18 18:11:19 +01:00
kent@mysql.com
63b4ce720a
Merge
2005-12-18 15:26:37 +01:00
knielsen@mysql.com
fb50e37c5a
BUG#15805: Disabled test type_time; fails in --ps-protocol mode.
2005-12-16 09:38:30 +01:00
holyfoot@mysql.com
473580f085
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/hf/work/mysql-5.1.clean
2005-12-15 22:06:02 +04:00
holyfoot@deer.(none)
0a4426c0be
tests fixed as we implement informative error message
2005-12-15 20:56:14 +04:00
aivanov@mysql.com
e6b08a5ea9
Merge mysql.com:/home/alexi/dev/mysql-4.1-12440
...
into mysql.com:/home/alexi/dev/mysql-5.0-12440
2005-12-15 18:59:40 +03:00
aivanov@mysql.com
ea4c3481f2
Fixed BUG #12440 : "Incorrect processing of time values containing
...
long fraction and/or large exponent part".
2005-12-15 18:48:08 +03:00
jonas@perch.ndb.mysql.com
2180197c9b
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-release
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2005-12-15 15:11:42 +01:00
holyfoot@mysql.com
f934268da1
Merge bk@192.168.21.1:mysql-5.1-new
...
into mysql.com:/home/hf/work/mysql-5.1.clean
2005-12-15 16:55:12 +04:00
holyfoot@deer.(none)
dec0720a80
bug #15524 (partitioning range/list violation error message is insufficient)
2005-12-15 16:20:56 +04:00
holyfoot@deer.(none)
55e7f4503e
bug #15521 (Cannot reorganise a partition with a new name equal to the old name)
2005-12-15 15:24:35 +04:00
joerg@trift-lap.fambruehe
7e36dc1cc6
Merge joerg@trift2:/M50/part2-ramil
...
into trift-lap.fambruehe:/MySQL/M51/merge-5.1
2005-12-14 23:05:08 +01:00
joerg@trift-lap.fambruehe
81df985a6a
Merge trift-lap.fambruehe:/MySQL/M51/part1-kent-knielsen
...
into trift-lap.fambruehe:/MySQL/M51/merge-5.1
2005-12-14 21:39:17 +01:00
ramil@mysql.com
04cff0d055
Fix for bug #15623 : Test case rpl000001 and rpl_error_ignored_table failure on MacOSX
...
and bug #15668 : Test 'sp-error' crashes server on Mac OS X.
2005-12-14 21:42:08 +04:00
kent@mysql.com
8e5b353598
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-14 16:50:28 +01:00
mskold@mysql.com
138ec21cc9
Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more predictable
2005-12-14 16:29:56 +01:00
aivanov@mysql.com
c6f658d09e
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss28
2005-12-14 18:08:56 +03:00
jonas@perch.ndb.mysql.com
2059a6c174
bug#15682 - ndb
...
incorrect handling of varchar in position/rnd_pos
Commit for 5.0.17 release clone
2005-12-14 15:09:12 +01:00
mskold@mysql.com
0663f81acd
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-12-14 14:49:59 +01:00
mskold@mysql.com
973dedbf08
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-12-14 14:48:42 +01:00
mskold@mysql.com
c08ee431bd
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-12-14 14:46:24 +01:00
mskold@mysql.com
b0500f54c8
Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more predictable
2005-12-14 14:45:13 +01:00
kent@mysql.com
c11b35d9bf
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-14 13:18:24 +01:00
kent@mysql.com
45b81ac196
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-14 13:09:41 +01:00
jonas@perch.ndb.mysql.com
6a02895276
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-12-14 11:34:08 +01:00
jani@hundin.mysql.fi
b846c5463b
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into hundin.mysql.fi:/home/jani/mysql-5.1-new
2005-12-14 12:32:58 +02:00
jonas@perch.ndb.mysql.com
4454e7a631
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2005-12-14 11:06:40 +01:00
jonas@perch.ndb.mysql.com
1864165ff3
bug#15682 - ndb - invalid handling of varchar in position/rnd_pos
2005-12-14 10:57:09 +01:00