monty@mishka.local
8437e9c1be
Fixes during review of new pushed code
...
Change bool in C code to my_bool
Added to mysqltest --enable_parsning and --disable_parsing to avoid to have to comment parts of tests
Added comparison of LEX_STRING's and use this to compare file types for view and trigger files.
2005-07-31 12:49:55 +03:00
monty@mysql.com
15d48525af
Merge mysql.com:/home/my/mysql-4.1
...
into mysql.com:/home/my/mysql-5.0
2005-07-28 17:09:54 +03:00
monty@mysql.com
24d45c5c30
Merge mysql.com:/home/my/mysql-4.0
...
into mysql.com:/home/my/mysql-4.1
2005-07-27 13:24:59 +03:00
monty@mysql.com
4098c40d87
Review fixes:
...
Fixed portability problem with bool in C programs
Moved close_thread_tables out from LOCK_thread_count mutex (safety fix)
my_sleep() -> pthread_cond_timedwait()
2005-07-26 17:55:58 +03:00
bar@mysql.com
0255803b4e
Merge mysql.com:/usr/home/bar/mysql-4.1.b10201
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-07-26 13:25:18 +05:00
jani@a193-229-222-105.elisa-laajakaista.fi
ca0803a024
Undefined RINT for Netware.
2005-07-23 01:11:29 +03:00
jimw@mysql.com
6e955625f6
Merge mysql.com:/home/jimw/my/mysql-5.0-build
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-22 12:36:17 -07:00
joerg@mysql.com
306ade1fd5
Add the definition of "floatget".
...
Necessary to compile 5.0.10 on Windows, no bug report filed.
2005-07-22 20:37:59 +02:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
6026054ead
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
2005-07-21 01:29:57 -04:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
9663b9a974
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
2005-07-20 21:58:33 -04:00
georg@lmy002.wdf.sap.corp
dc0645f7cf
Merge grichter@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-4.1
2005-07-20 13:32:43 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
0f7639ba15
Added some missing casts and changed a define for alloca().
2005-07-20 13:27:57 +03:00
jimw@mysql.com
d7fbff3ec5
Merge mysql.com:/home/jimw/my/mysql-5.0-5906
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 19:59:34 -07:00
jimw@mysql.com
2a06e5756e
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 19:59:32 -07:00
konstantin@mysql.com
14344b658a
A fix and a test case for Bug#10760 and complementary cleanups.
...
The idea of the patch
is that every cursor gets its own lock id for table level locking.
Thus cursors are protected from updates performed within the same
connection. Additionally a list of transient (must be closed at
commit) cursors is maintained and all transient cursors are closed
when necessary. Lastly, this patch adds support for deadlock
timeouts to TLL locking when using cursors.
+ post-review fixes.
2005-07-19 22:21:12 +04:00
jimw@mysql.com
80c1c6b33f
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 11:05:49 -07:00
monty@mishka.local
7e83d09ce7
Simple fixes during review of new code
2005-07-19 19:25:05 +03:00
georg@lmy002.wdf.sap.corp
21a88afeed
minor fix (backport from 5.0) - changed function prototype/definition
2005-07-19 17:12:00 +02:00
ingo@mysql.com
ec15dda2bf
Bug#10932 - Building server with key limit of 128, makes test cases fail
...
This patch allows to configure MyISAM for 128 indexes per table.
The main problem is the key_map, wich is implemented as an ulonglong.
To get rid of the limit and keep the efficient and flexible
implementation, the highest bit is now used for all upper keys.
This means that the lower keys can be disabled and enabled
individually as usual and the high keys can only be disabled and
enabled as a block. That way the existing test suite is still
applicable, while more keys work, though slightly less efficient.
To really get more than 64 keys, some defines need to be changed.
Another patch will address this.
2005-07-19 14:13:56 +02:00
jimw@mysql.com
dd2f631ec4
Fix number to date conversion so it always honors the NO_ZERO_DATE,
...
NO_ZERO_IN_DATE, and INVALID_DATES bits of SQL_MODE. (Bug #5906 )
2005-07-18 16:12:44 -07:00
mronstrom@mysql.com
2d23c691f7
Bug #10600
...
remove_table_from_cache fails to signal other thread and gets
blocked when other thread also gets blocked
2005-07-19 00:29:19 +02:00
monty@mishka.local
21ae963205
Fixes to previous changeset
...
get_defaults_file() -> get_defaults_options()
2005-07-18 20:05:30 +03:00
monty@mishka.local
2278e0319c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-07-18 19:03:01 +03:00
monty@mishka.local
78c65b5adc
Cleanups during review
...
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
2005-07-18 15:33:18 +03:00
georg@lmy002.wdf.sap.corp
53c630a524
Restore previous used client charset in mysql_reconnect
...
Moved mysql_set_character_set function to client.c
Changed function prototype for mysql_set_character_set (as suggested
by Konstantin)
2005-07-16 07:13:40 +02:00
lars@mysql.com
6db2602ad0
Merge mysql.com:/home/bkroot/mysql-4.1
...
into mysql.com:/home/bk/mysql-5.0
2005-07-13 02:13:04 +02:00
reggie@linux.site
c31d71c065
Fixed some vio code that was using ___WIN__ instead of __WIN__
2005-07-12 10:31:09 -06:00
mskold@mysql.com
2dd4dd9291
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-07-12 11:46:53 +02:00
georg@lmy002.wdf.sap.corp
55d413252f
changes after Bar's review: renamed CHARACTER_SET to MY_CHARSET_INFO
2005-07-12 10:58:21 +02:00
mskold@mysql.com
f741566646
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-07-12 10:57:01 +02:00
georg@lmy002.wdf.sap.corp
ceba4ee9cd
New attempt after Bar's review
...
Added api function mysql_get_character_set_info which provides
information about the current client character set.
2005-07-12 10:31:43 +02:00
brian@avenger.(none)
0c5ac2dd5b
Fix for gcc 4.0 (they have removed min/max operators).
2005-07-11 16:56:18 -07:00
ramil@mysql.com
fe09e62d36
Merge mysql.com:/usr/home/ram/work/mysql-4.1
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-07-06 14:01:30 +05:00
ramil@mysql.com
f82420356f
a fix (bug #11544 : Use of missing rint() function on QNX).
2005-07-06 13:51:53 +05:00
jimw@mysql.com
485f2c93c2
Merge mysql.com:/home/jimw/my/mysql-5.0-10214
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-05 09:47:20 -07:00
bell@sanja.is.com.ua
d3905f3d0e
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
konstantin@mysql.com
f60ebc4815
A fix and a test case for Bug#10794 "mysql_stmt_attr_set no
...
open cursor after mysql_stmt_execute" + post-review fixes.
The bug was caused by wrong flags in stmt->server_status on the client
side: if there was no cursor, the server didn't send server_status
flags to the client, and the old flags were used to set up the
fetch function of a statement. Consequently, stmt_read_row_from_cursor was
used when there was no cursor. The fix fixes the server to always
send server flags to the client.
2005-06-30 16:17:10 +04:00
marty@linux.site
e4aedcc2c1
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into linux.site:/home/marty/MySQL/mysql-5.0
2005-06-30 12:20:52 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
3df73db1cf
Applied some Netware related patches.
2005-06-29 14:02:11 +03:00
ingo@mysql.com
ef6d371113
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug8321
2005-06-24 19:47:20 +02:00
ingo@mysql.com
1c33fbc4c1
Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
...
Bug#10568 - Function 'LAST_DAY(date)' does not return NULL for invalid argument.
Manual merge.
2005-06-24 19:47:18 +02:00
ingo@mysql.com
e81358565b
Bug#8321 - myisampack bug in compression algorithm
...
Added 64-bit extensions, comments, extended statistics
and trace prints.
2005-06-24 19:34:55 +02:00
ramil@mysql.com
66330a9d59
an improvement (bug #7851 : C++ 'new' conflicts with kernel header asm/system.h).
2005-06-24 12:51:11 +05:00
jimw@mysql.com
3ccb90c085
Make status of NO_BACKSLASH_ESCAPES mode known to the client so
...
it can use it to switch to only quoting apostrophes by doubling
them when it is in effect. (Bug #10214 )
2005-06-23 18:29:56 -07:00
konstantin@mysql.com
b3d977df10
Rename all prepared statements COM_ commands to prefix with COM_STMT_
2005-06-17 23:26:25 +04:00
joreland@mysql.com
5e4ce743a3
Merge mysql.com:/home/jonas/src/wl1882
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-06-13 11:59:51 +02:00
kent@mysql.com
811e51ec84
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-10 20:12:45 +02:00
jimw@mysql.com
a5285b141e
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-09 18:00:47 -07:00
kent@mysql.com
4d0a81aa8b
config-win.h:
...
Enabled yaSSL on Windows
Many files:
Added yaSSL to Visual Studio 6 project files
2005-06-09 05:04:59 +02:00
svoj@mysql.com
f9751e1785
Merge mysql.com:/var/tmp/sslbug/mysql-4.0
...
into mysql.com:/var/tmp/sslbug/mysql-4.1
2005-06-08 21:40:58 +05:00