monty@mysql.com
8aeb63dd3b
Update VC++ files
...
Portability fixes
After merge fixes
2003-11-21 01:53:01 +02:00
serg@serg.mylan
5443cba38e
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-11-20 23:25:59 +01:00
monty@mysql.com
32a62d5069
Merge with 4.0 to revert patch for BIGINT assignment to double
2003-11-21 00:17:46 +02:00
serg@serg.mylan
8ca1836207
yet another trunc* bug
2003-11-20 23:15:07 +01:00
monty@mysql.com
41eda1c949
Revert patch for bigint handling in double context as it broke normal bigint handling
...
The right way to fix this is to change the Field::store(longlong) method to be
Field::store(longlong, bool unsigned_flag), but this is better to do in 4.1 than in 4.0
2003-11-21 00:11:50 +02:00
serg@serg.mylan
cb235f43c9
Merge
2003-11-20 23:07:31 +01:00
sergefp@mysql.com
30b3c3bf1b
Merged, most likely needs post-merge fix
2003-11-21 00:27:54 +03:00
serg@sergbook.mylan
55182340ba
more left join tests
2003-11-20 22:20:54 +01:00
monty@mysql.com
b01fcb4e14
Merge with 4.0 to get:
...
Fix for storing negative values in decimal fields
Fix for FLUSH TABLE with HANDLER
2003-11-20 22:30:48 +02:00
sergefp@mysql.com
4016048d81
logging_ok:
...
Logging to logging@openlogging.org accepted
sql_union.cc, sql_select.cc, opt_range.h, opt_range.cc, opt_ft.h:
Post-merge fixes
Many files:
new file
2003-11-20 23:27:11 +03:00
monty@mysql.com
55e07608fd
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2003-11-20 22:07:02 +02:00
monty@mysql.com
7c6113a39f
Merge key cache structures to one
...
Fixed compiler warnings (IRIX C compiler and VC++)
2003-11-20 22:06:25 +02:00
paul@ice.snake.net
9cf6cf8370
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Users/paul/mysql-4.1
2003-11-20 14:03:45 -06:00
paul@ice.snake.net
4909a37eac
Use same style for SHOW MASTER STATUS fields as
...
for SHOW SLAVE STATUS.
2003-11-20 13:49:05 -06:00
paul@ice.snake.net
53c93091f2
Write slave status field names using consistent style.
...
(Initial caps for each word.) For example, instead of writing
Until_condition, Until_Log_File, and Until_log_pos, write
Until_Condition, Until_Log_File, and Until_Log_pos.
2003-11-20 13:07:25 -06:00
paul@ice.snake.net
ee46b6909c
Typo.
2003-11-20 12:55:07 -06:00
konstantin@mysql.com
dd287a4cdf
added comments to simple_order, simple_group, no_order, skip_sort_order
2003-11-20 21:21:56 +03:00
jani@ua167d18.elisa.omakaista.fi
0b1bae4677
Added error reporting if one of the multi queries failed.
2003-11-20 20:06:51 +02:00
pem@mysql.comhem.se
5e46a05960
Fixed BUG#1874: Don't call fix_fields() indiscriminately, it resets null_value
...
for some items, which made aggregates like MIN(), MAX() and SUM() fail.
2003-11-20 18:30:02 +01:00
pem@mysql.comhem.se
05f25feaa9
Handle null values correctly in SP local variables.
2003-11-20 16:14:24 +01:00
pem@mysql.comhem.se
96f1252899
Bugfixes in SHOW CREATE PROCEDURE/FUNCTION and SHOW PROCEDURE/FUNCTION STATUS;
...
- dropped routines should not show up in status
- error handling for non-existing routines
+ some cleanup.
2003-11-20 15:07:22 +01:00
bell@sanja.is.com.ua
da73d77f6f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2003-11-20 14:42:40 +02:00
jani@rhols221.adsl.netsonic.fi
cc2916c459
Added multi command support for mysql client.
2003-11-20 14:33:07 +02:00
bell@sanja.is.com.ua
1c38b23f96
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2003-11-20 14:31:47 +02:00
bell@sanja.is.com.ua
1d84fa4d4e
fixed memory allocation
2003-11-20 14:31:10 +02:00
hf@deer.(none)
37e8b932ba
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1-w1284
2003-11-20 12:56:42 +04:00
hf@deer.(none)
72566c794e
SCRUM
...
WL#1284 (warnings about --skip-name-resolve)
Now MySQL will issue warnings during startup about entries in
grant tables with hostnames that require resolve, and after
GRANT commands with that kind of hostnames.
2003-11-20 12:55:48 +04:00
monty@mashka.mysql.fi
ba659679e7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-4.1
2003-11-20 03:12:17 +02:00
monty@mashka.mysql.fi
f382adcfca
Portability fixes (AIX43)
...
Add missing file to VC++ project
2003-11-20 03:11:33 +02:00
monty@mashka.mysql.fi
ac76198330
Portability fixes for AIX43
2003-11-20 02:48:09 +02:00
guilhem@mysql.com
a684227c4a
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-11-19 23:40:59 +01:00
guilhem@gbichot2
4bd3b096a0
Official builds are tested with mysql-test-run --sleep=10, and the slave
...
has (in mysql-test-run) a slave-net-timeout=10. So the 'sleep 1' below
was converted in 'sleep 10', so slave thought that connection was down,
so reconnected, so got an additional (fake) Rotate event, which shifted
the positions displayed by SHOW SLAVE STATUS.
2003-11-19 23:39:08 +01:00
serg@serg.mylan
707e7e8992
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-11-19 23:13:48 +01:00
serg@serg.mylan
0c2107c6b4
minor fixups: more verbose on "no memory" errors - report requested size, avoid flushing rec buffer to a file that is closed and deleted already (on got_error=1)
2003-11-19 23:07:31 +01:00
bell@sanja.is.com.ua
a1272bbfd2
fixed memory allocation problem in IN with const rows
2003-11-19 19:31:19 +02:00
pem@mysql.comhem.se
5b355ea6f5
Post-merge fixes.
2003-11-19 16:59:35 +01:00
lenz@mysql.com
ad309d5e0d
- removed some undefined non-weak symbols in libmysqlclient_r by
...
setting LIBS to include @openss_libs@ (BUG#1652)
2003-11-19 16:38:01 +01:00
monty@mashka.mysql.fi
f16ee29846
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-4.1
2003-11-19 17:34:57 +02:00
monty@mashka.mysql.fi
0bd17351ca
Changed mysql_next_result() to return int instead of bool
...
Changed ~Item_func_in() to call cleanup() (to fix memory leak)
Fixed test_multi_statements() test in client_test
2003-11-19 17:31:57 +02:00
pem@mysql.com
28a2c6a96b
Merging 4.1->5.0.
2003-11-19 15:19:46 +01:00
bar@bar.mysql.r18.ru
8e1584d79e
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-11-19 15:00:01 +04:00
bar@bar.mysql.r18.ru
4accd55c71
cp850.xml:
...
There were errors in cp850: in unicode, ctype and sort arrays
2003-11-19 14:59:12 +04:00
pem@mysql.comhem.se
c4871b240d
Fixed BUG#1862 (flush table in SPs didn't work).
...
Fixed various bugs: setting local variables to NULL, SELECT INTO var now actually
might work, SELECT INTO with not row now gives a "no data" warning (instead of
the "empty query" error), etc.
Updated test cases accordingly.
2003-11-19 11:26:18 +01:00
pem@mysql.comhem.se
1d300f81d0
Fixed C syntax error in mysys/mf_keycache.c.
2003-11-19 09:45:49 +01:00
lenz@kallisto.local
75ba1891bd
- added a missing comma in sql_yacc.yy (maybe a merge error?)
2003-11-18 22:47:04 +01:00
serg@serg.mylan
11f70bdfc4
Bug#1826, HANDLER+ALTER TABLE=crash (unfortunately, it cannot be tested in mysql-test suite)
...
more user variable tests
2003-11-18 22:06:47 +01:00
lenz@mysql.com
9258cae133
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2003-11-18 21:41:23 +01:00
bell@sanja.is.com.ua
dcdc78864d
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2003-11-18 22:24:43 +02:00
lenz@mysql.com
8ab3160d7e
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2003-11-18 21:23:41 +01:00
greg@mysql.com
678d465727
Merge gweir@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/bk/mysql-4.1
2003-11-18 15:20:33 -05:00