Commit graph

11535 commits

Author SHA1 Message Date
paul@ice.snake.net
037b4724fc Merge 2004-03-08 14:38:03 -06:00
paul@teton.kitebird.com
d292e9bd1f Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2004-03-08 14:08:10 -06:00
paul@ice.snake.net
0ad9849ec5 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-08 14:05:07 -06:00
serg@serg.mylan
a10d3d5673 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-08 20:59:03 +01:00
konstantin@oak.local
6a10859bee Comment for do_command moved inside #ifndef EMBEDDED_LIBRARY. 2004-03-08 17:47:42 +03:00
guilhem@mysql.com
91370d96ed Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-03-08 14:47:49 +01:00
guilhem@mysql.com
2c31370a30 Fix for BUG#3081 "if an INSERT DELAYED is killed, it is binlogged as killed but it's not needed".
INSERT DELAYED works only for one-row inserts (in latest 4.0 versions
at least). So killing a delayed_insert thread does not spoil replication:
the rows which actually went into the table are exactly those listed
in the binlog. So when the delayed_insert thread is killed, don't log
it as 'killed', because it causes superfluous stops on the slave.
2004-03-08 14:47:13 +01:00
paul@ice.snake.net
ea28e842cd Make SHOW VARIABLES output really alphabetic.
Note: the patch removes an extra declaration of
the read_only variable. It also assumes that '_'
sorts before [a-z].
2004-03-07 20:19:37 -06:00
paul@ice.local
09113817d2 SESSION instead of LOCAL in error messages. 2004-03-07 08:32:00 -06:00
paul@ice.snake.net
f47fa6a780 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-06 10:02:43 -06:00
vva@eagle.mysql.r18.ru
99cd60a448 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1
2004-03-06 20:02:42 +04:00
vva@eagle.mysql.r18.ru
2501a54d31 corrected spelling error horisontal->horizontal
into client/mysqltest.c
2004-03-06 20:00:54 +04:00
vva@eagle.mysql.r18.ru
5ccb6a1cc7 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2593/mysql-4.1
2004-03-06 18:27:11 +04:00
monty@mysql.com
73780de129 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-03-06 10:43:53 +02:00
monty@mysql.com
ef971bb604 Ensure that one can't from the command line set a variable too small. (Bug #2710)
Allow one to force lower_case_table_names to 0, even if the file system is case insensitive. This fixes some issues on Mac OS X (Bug #2994)
Added variables "lower_case_file_system", "version_compile_os" and "license"
2004-03-06 10:43:35 +02:00
paul@ice.snake.net
72d8315541 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-05 18:24:38 -06:00
serg@serg.mylan
0192481ebe Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-06 00:02:13 +01:00
vva@eagle.mysql.r18.ru
d52086295f Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1
2004-03-06 03:02:12 +04:00
vva@eagle.mysql.r18.ru
e8d78e5a4a Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1
2004-03-06 03:01:09 +04:00
vva@eagle.mysql.r18.ru
a8bbcc52a9 - added commands --query_vertical and --query_horisontal to client/mysqltest.cc
- get my_strtod to return inf
- get Field_float::store(double) and Field_double::store(float) to set null for 
nan value 
(as extra serg's recomendations to fix for patch on 
 Bug #2082 'mysqldump converts "inf" to null')
2004-03-06 03:00:21 +04:00
paul@ice.snake.net
cd1eecf97b Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-05 12:38:36 -06:00
paul@teton.kitebird.com
c696fc6299 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2004-03-05 12:37:54 -06:00
vva@eagle.mysql.r18.ru
29bc7b03a0 fixed Bug #2985
"Table truncated when creating another table name with Spaces"
added to check_db_name, check_table_name and check_column_name
test for end space
2004-03-05 22:13:33 +04:00
monty@mysql.com
9618683f3c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-03-05 19:50:12 +02:00
monty@mysql.com
8f093d0fb3 Portability fixes 2004-03-05 19:49:50 +02:00
paul@teton.kitebird.com
cf4707acfb Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2004-03-05 11:16:32 -06:00
paul@ice.snake.net
1d9a89b23f Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-05 11:16:06 -06:00
konstantin@mysql.com
1d624d3546 Fix for C++ style declaration 2004-03-05 19:04:59 +03:00
ingo@mysql.com
5e54670a09 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mydev/mysql/mysql-4.1
2004-03-05 15:20:45 +01:00
vva@eagle.mysql.r18.ru
d2f0d0726b commented testcases in show_check.test with quotation marks in table name
to avoid troubles with OS which don't support these symbols in file name
used create table 'a/b' as hook for WL#1324 which should fix this problem
2004-03-05 17:57:36 +04:00
konstantin@mysql.com
ce2db5c303 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-rename
2004-03-05 16:55:50 +03:00
konstantin@mysql.com
7753c6b93e New call mysql_stmt_init() introduced.
Renames:
mysql_bind_param      -> mysql_stmt_bind_param
mysql_bind_result     -> mysql_stmt_bind_result
mysql_execute         -> mysql_stmt_execute
mysql_fetch           -> mysql_stmt_fetch
mysql_fetch_column    -> mysql_stmt_fetch_column
mysql_get_metadata    -> mysql_stmt_result_metadata
mysql_param_count     -> mysql_stmt_param_count
mysql_param_result    -> mysql_stmt_param_metadata
mysql_prepare         -> mysql_stmt_prepare
mysql_send_long_data  -> mysql_stmt_send_long_data

client_test.c cleaned up from memory leaks
2004-03-05 16:55:09 +03:00
ingo@mysql.com
235f0ffec1 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mydev/mysql/mysql-4.1
2004-03-05 13:48:38 +01:00
serg@serg.mylan
a5c2e89654 variable's name corrected 2004-03-05 12:03:04 +01:00
greg@mysql.com
54c1debc1c Enhanced my_getsystime for NetWare. 2004-03-04 22:59:04 -01:00
serg@serg.mylan
46c03de1a9 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-05 00:20:24 +01:00
serg@serg.mylan
de6d3b8dff UNHEX() function 2004-03-04 23:18:54 +01:00
mydev@mysql.com
3d13fb00b3 Fixed a type mismatch between int_table_flags and table_flags() in MyISAM handler. 2004-03-04 22:53:48 +01:00
bell@sanja.is.com.ua
4c78e46351 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2004-03-04 20:30:29 +02:00
jani@ua72d24.elisa.omakaista.fi
34a332c086 Added option chroot to mysqlhotcopy.
Useful in case mysqld was started with chroot.
2004-03-04 18:30:28 +00:00
vva@eagle.mysql.r18.ru
16dccfae3c Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_1661/mysql-4.1
2004-03-04 22:21:19 +04:00
vva@eagle.mysql.r18.ru
9b54c1bfde Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_1661/mysql-4.1
2004-03-04 22:19:41 +04:00
vva@eagle.mysql.r18.ru
cba6ff7597 fixed Bug #3051 "FLOOR returns invalid" 2004-03-04 22:11:33 +04:00
jani@ua72d24.elisa.omakaista.fi
58869cfe9a Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0
into ua72d24.elisa.omakaista.fi:/home/my/bk/mysql-4.0
2004-03-04 17:58:59 +00:00
jani@ua72d24.elisa.omakaista.fi
58a978b900 Fixed Bug#2491, INSERT DELAYED causes binary log unusable by mysqlbinlog (replication is ok)
Setting insert delayed threads = 0 at mysql_init_command.
2004-03-04 17:58:36 +00:00
vva@eagle.mysql.r18.ru
b097995293 Fixed bug #2082 'mysqldump converts "inf" to NULL' and
added commands vertical_results and horisontal_results to client/mysqltest.c
2004-03-04 21:08:14 +04:00
bell@sanja.is.com.ua
d03034d306 invalidation of locking for write tables (BUG#2693)
fixed linking query_prealloc_size to query cache presence
2004-03-04 18:32:55 +02:00
monty@mysql.com
b9c4ee353d Rollback UPDATE/DELETE statements on kill
nsure that rows in a multi-row INSERT DELAYED are inserted atomicly
2004-03-04 18:16:10 +02:00
guilhem@mysql.com
9c4b9e6df1 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-03-04 15:45:03 +01:00
guilhem@mysql.com
9beae2895f Fix for BUG#3063 "Don't mark an auto DROP TEMP TABLE as 'killed' in the binlog";
even if the thread was killed, we write the DROP with error_code=0.
This will remove unneeded stops on slave, and will lose nothing:
if a real update was killed, this real update will be logged with the
nonzero error code and will cause the stop on slave.
2004-03-04 15:44:24 +01:00