acurtis@pcgem.rdg.cyberkinetica.com
9eacf61dcb
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8057
2005-02-03 23:41:58 +00:00
pekka@mysql.com
a802291474
ndb - sol9x86: cc -xO3: fix optimizer error.
2005-02-03 23:56:13 +01:00
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
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
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
tulin@mysql.com
e70445d318
made an .sh file of ndb-config-2-node.ini instead
2005-02-03 17:58:02 +01:00
tulin@mysql.com
a2b62c5b2d
ndbcluster rpms
2005-02-03 17:53:03 +01: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
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
lenz@mysql.com
7213ca46ad
Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
2005-02-02 19:25:43 +01:00
lenz@mysql.com
164b2ddf39
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-02-02 19:24:13 +01:00
lenz@mysql.com
e24d97ae58
- typo fix...
2005-02-02 19:23:24 +01:00
lenz@mysql.com
bac61c6b7a
Merge mysql.com:/data0/mysqldev/my/mysql-4.1
...
into mysql.com:/data0/mysqldev/my/mysql-4.1-build
2005-02-02 18:45:29 +01:00
tulin@mysql.com
446e18c91e
fix linkerror on sol9x86
2005-02-02 18:30:33 +01:00
jimw@mysql.com
bcac063558
Fix merge of func_str tests (accidently duplicated a test).
2005-02-02 09:05:52 -08:00
mysqldev@mysql.com
dd71fde35a
Merge production:my/mysql-4.1-build
...
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-02 18:04:01 +01:00
jimw@mysql.com
5f0c4ff140
Merge fixes for #8248 , #5569 .
2005-02-02 08:21:11 -08:00
jimw@mysql.com
4104f160cb
Merge mysql.com:/home/jimw/my/mysql-4.1-8207
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-02 07:51:55 -08:00
jimw@mysql.com
2ab66e644a
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-02 07:49:30 -08:00
monty@mysql.com
b131520f9d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-02-02 16:50:35 +02:00
lenz@mysql.com
7cb5afc052
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-build
2005-02-02 13:45:32 +01:00
lenz@mysql.com
70b8360323
Small Do-compile improvements:
...
- added Option "--comment" to be able to override the default compilation comment
- improved the abort subroutine to not rely on an external "tail" command (the
default /usr/bin/tail on Solaris does not understand the "-n" notation).
Get rid of a "useless use of cat" case in the process.
2005-02-02 13:40:17 +01:00
serg@serg.mylan
33fc4b10b6
configure.in
...
don't define UNIV_DEBUG in CFLAGS/CXXFLAGS anymore
sql/mysqld.cc
hide from the user options that do nothing
sql/sql_update.cc
better fix for uninitialized used_index
2005-02-02 12:08:20 +01:00
tulin@mysql.com
3bdb97343a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-02 11:13:35 +01:00
tulin@mysql.com
653c6fa1ad
backported configure flag from 5.0
...
workaround for HPUX signal.h error, missing extern "C"
moved my_thread_end to NdbThreadExit
more checks for shared memory transporter signum setup
2005-02-02 10:50:33 +01:00
igor@rurik.mysql.com
9a779d6441
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-01 23:54:39 -08:00
igor@rurik.mysql.com
0fb0dab4ca
func_str.result, func_str.test:
...
Added a test case for bug #7751 .
item_strfunc.cc:
Fixed bug #7751 .
The function Item_func_conv::val_str did not update
the unsigned_flag value.
2005-02-01 23:34:31 -08:00
pekka@mysql.com
ea5c1f324c
ndb - backup fix, found on powermacg4
2005-02-02 03:58:43 +01:00
jimw@mysql.com
2caee2b3f2
Merge mysql.com:/home/jimw/my/mysql-4.0-clean
...
into mysql.com:/home/jimw/my/mysql-4.0-8248
2005-02-01 18:34:28 -08:00
jimw@mysql.com
d9e128d78f
Merge bk-internal:/home/bk/mysql-4.0
...
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-02-01 18:34:16 -08:00
jimw@mysql.com
e86457cef0
Fix QUOTE() to not reuse the input field for output, which resulted in
...
incorrect results when the input was a constant across a multi-row SELECT
statement. (Bug #8248 )
2005-02-01 18:29:10 -08:00
heikki@hundin.mysql.fi
7fb3a79794
Merge hundin.mysql.fi:/home/heikki/mysql-4.0
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-02-02 01:47:46 +02:00
heikki@hundin.mysql.fi
b75bfa828d
eval0eval.ic:
...
Remove wrong assertion that fails on 64 bits
2005-02-02 01:43:25 +02:00
jimw@mysql.com
76ff72d73f
Merge mysql.com:/home/jimw/my/mysql-4.0-5569
...
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-02-01 15:38:27 -08:00
heikki@hundin.mysql.fi
b0a343dd06
Merge hundin.mysql.fi:/home/heikki/mysql-4.0
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-02-02 00:41:25 +02:00
heikki@hundin.mysql.fi
e5479c3f90
rem0rec.ic:
...
Fix a debug assertion in rem0rec.ic on AMD64; 4.1 was already fixed
2005-02-02 00:31:06 +02:00
heikki@hundin.mysql.fi
11c0260147
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-02-02 00:22:19 +02:00
jimw@mysql.com
a8039e1ac8
Make sure mysql_client_test and embedded test clients get added to
...
binary distribution on all platforms.
2005-02-01 11:59:44 -08:00
tulin@mysql.com
9ac631705a
cleanup and streamlining of thread create/exit in ndb
2005-02-01 19:01:37 +01:00
reggie@bob.(none)
b018755ea6
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bob.(none):/home/reggie/bk/mysql41
2005-02-01 08:46:56 -06:00
monty@mysql.com
b87e0c52a7
Proper fix for comparision with ' '
...
(Bug #7788 "Table is full" occurs during a multitable update")
2005-02-01 16:27:08 +02:00
monty@mysql.com
4e92f2afb1
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/my/mysql-4.0
2005-02-01 15:38:48 +02:00
monty@mysql.com
0751cb8ff1
Remove #if 0 as this only confuses the code withing adding anything
2005-02-01 15:36:48 +02:00
ram@gw.mysql.r18.ru
26dcd87ee6
merging
2005-02-01 17:20:32 +04:00