Commit graph

19862 commits

Author SHA1 Message Date
acurtis@pcgem.rdg.cyberkinetica.com
1cb1dcb0f3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8057
2005-02-03 21:16:36 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
b8ceaa4a1f Bug#8057
Fix crash with LAST_INSERT_ID() in UPDATE,
  Tests included,
2005-02-03 21:11:12 +00:00
kent@mysql.com
4f7ce4333f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-03 21:56:57 +01:00
kent@mysql.com
725877e5fa mtr_cases.pl:
new file
2005-02-03 21:50:56 +01:00
guilhem@mysql.com
2832462376 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-02-03 21:26:53 +01:00
guilhem@mysql.com
0ba8a3d48b result update after merge 2005-02-03 21:24:27 +01:00
mikael@orca.ndb.mysql.com
3b535f6072 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into orca.ndb.mysql.com:/export/home/mikael/mysql-5.0
2005-02-03 21:16:05 +01:00
kent@mysql.com
796d00f8ea Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-03 21:16:04 +01:00
mikael@orca.ndb.mysql.com
0bb030a145 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into orca.ndb.mysql.com:/export/home/mikael/mysql-4.1
2005-02-03 21:13:28 +01:00
kent@mysql.com
1f088e95d3 mysql-test-run.pl:
Let --start-and-exit actually start a server
  Added that test case names can be specified on the comman line
  Added embedded server support
  Added environment variables UMASK, UMASK_DIR
  Added missing MASTER_MYSOCK1, MASTER_MYPORT1, USE_RUNNING_SERVER
  Added missing CHARSETSDIR, MYSQL_FIX_SYSTEM_TABLES, MYSQL_CLIENT_TEST
  Pass on return value from sleep_until_file_created(), to fail test
  Fail test if early termination of mysqld servers
  Create intial databases for the second master, and two additional slaves
mtr_process.pl:
  Find out if port is still in use, using simple TCP connect
  Use non blocking waitpid() to catch terminations early
  Make a special case spawning the 'mysqltest' application
  Redo the fork() if it returns EAGAIN
  Make sure to record if master or slave terminated
  Improved debugging output
  Improved code that remove PID files to avoid race
  Abort if we can't stop all mysqld servers using our ports
  Many improvements in killing mysqld servers
  Let sleep_until_file_created() catch if server died early
mtr_report.pl:
  Added option to disable test cases using <testcase>.disabled file
  If --timer, only try to open file with time data if it exists
mtr_io.pl:
  Remove starting/ending space reading server options from file
2005-02-03 21:13:27 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
acd90be608 Bug#7310
Fix test for classic builds
2005-02-03 18:26:59 +00:00
guilhem@mysql.com
a85df46c01 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-02-03 18:55:29 +01:00
gluh@gluh.mysql.r18.ru
be5532d36a Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-03 20:46:53 +03:00
mronstrom@mysql.com
ddd890f6e1 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/mikron/mysql-4.1
2005-02-03 18:22:06 +01:00
mronstrom@mysql.com
00e181afdc Merge mysql.com:/Users/mikron/mysql-4.1
into mysql.com:/Users/mikron/mysql-5.0
2005-02-03 18:19:39 +01:00
mysqldev@mysql.com
6e02e19b8a Merge mysql.com:/home/mysqldev/tulin/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-03 17:58:29 +01:00
tulin@mysql.com
e70445d318 made an .sh file of ndb-config-2-node.ini instead 2005-02-03 17:58:02 +01:00
mysqldev@mysql.com
92a99d80d0 Merge mysql.com:/home/mysqldev/tulin/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-03 17:54:03 +01:00
tulin@mysql.com
a2b62c5b2d ndbcluster rpms 2005-02-03 17:53:03 +01:00
joreland@mysql.com
9f48fb5bfc ndb - hugo
more removal of pNdb->closeTransaction
2005-02-03 17:16:00 +01:00
joreland@mysql.com
e304cc585f merge 2005-02-03 17:14:11 +01:00
joreland@mysql.com
40376788cc ndb - use hugo methods all the way in hugo
more test program fixes
  replace pNdb->closeTransaction with closeTransaction(pNdb)
2005-02-03 17:10:46 +01:00
joreland@mysql.com
4143a189c9 merge 2005-02-03 17:04:27 +01:00
mysqldev@mysql.com
a4a34a87c8 corrected automerge error 2005-02-03 17:00:51 +01:00
joreland@mysql.com
41e70c83b6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-03 17:00:51 +01:00
monty@mysql.com
b233ddba8e After merge fixes 2005-02-03 18:00:50 +02:00
guilhem@mysql.com
ac053d80e9 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-02-03 16:25:57 +01:00
guilhem@mysql.com
ed1696f6b9 WL#1062 "log charset info into all Query_log_event":
we store 7 bytes (1 + 2*3) in every Query_log_event.
In the future if users want binlog optimized for small size and less safe,
we could add --binlog-no-charset (and binlog-no-sql-mode etc): charset info
is something by design optional (even if for now we don't offer possibility to disable it):
it's not a binlog format change.
We try to reduce the number of get_charset() calls in the slave SQL thread to a minimum
by caching the charset read from the previous event (which will often be equal to the one of the current event).
We don't use SET ONE_SHOT for charset-aware repl (we still do for timezones, will be fixed later).
No more errors if one changes the global value of charset vars on master or slave
(as we log charset info in all Query_log_event).
Not fixing Load_log_event as it will be rewritten soon by Dmitri.
Testing how mysqlbinlog behaves in rpl_charset.test.
mysqlbinlog needs to know where charset file is (to be able to convert a charset number found
in binlog (e.g. in User_var_log_event) to a charset name); mysql-test-run needs to pass
the correct value for this option to mysqlbinlog.
Many result udpates (adding charset info into every event shifts log_pos in SHOW BINLOG EVENTS).
Roughly the same job is to be done for timezones :)
2005-02-03 16:22:16 +01:00
monty@mysql.com
43eb7cf303 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-03 16:50:06 +02:00
gluh@gluh.mysql.r18.ru
dd1dba19f0 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-03 17:33:57 +03:00
joreland@mysql.com
443e8be7d9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-03 15:15:43 +01:00
joreland@mysql.com
444639882f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-03 15:11:24 +01:00
monty@mysql.com
422c2eb868 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
jan@hundin.mysql.fi
d8659b27af Revert error I did. 2005-02-03 12:35:04 +02:00
jan@hundin.mysql.fi
8fc13ecc97 Fixed a bug: deadlock without any locking, simple select and update (Bug #7975). 2005-02-03 10:54:38 +02:00
msvensson@neptunus.homeip.net
3181f5d2b6 Merged "query cache for ndb" to 5.0 2005-02-03 09:33:48 +01:00
gluh@gluh.mysql.r18.ru
cacb8d74b4 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-03 11:12:01 +03:00
joreland@mysql.com
7e5174b82f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-03 07:11:16 +01:00
jimw@mysql.com
70f35fa6da Add --help to mysqld_safe. (Bug #7931) 2005-02-02 19:41:33 -08:00
jimw@mysql.com
37edc3436e Fix 'mysqlcheck --help' to not specify what storage engines are
supported, rather than give incorrect information. (Bug #8029)
2005-02-02 15:03:34 -08:00
monty@mysql.com
12bf600d18 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-02 22:41:18 +02:00
monty@mysql.com
209190d3df Review fixed 2005-02-02 22:39:21 +02:00
lenz@mysql.com
ff073f34a1 Merge mysql.com:/data0/mysqldev/my/mysql-4.1
into mysql.com:/data0/mysqldev/my/mysql-4.1-build
2005-02-02 21:36:40 +01:00
monty@mysql.com
e7450d9781 Use -DUNIV_DEBUG (extra debugging for InnoDB) when configuring with --debug=full 2005-02-02 22:35:36 +02:00
monty@mysql.com
8907374947 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-02 22:28:22 +02:00
joreland@mysql.com
a20e1b4104 ndb -
add abort to multi op test case
2005-02-02 21:03:46 +01:00
joreland@mysql.com
4ece8ae47d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-02 20:27:53 +01:00
monty@mysql.com
e791e86444 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-02 20:30:57 +02:00
lenz@mysql.com
0d3b8dca19 Merge mysql.com:/data0/mysqldev/my/mysql-4.1
into mysql.com:/data0/mysqldev/my/mysql-4.1-build
2005-02-02 19:30:08 +01:00
monty@mysql.com
3936edd7fa Fixed during review of new pulled code 2005-02-02 20:28:01 +02:00