kent@mysql.com
37788da790
Reapplied portability changes, from changesets by kent, joerg and msvensson
2005-11-06 02:19:51 +01:00
monty@mysql.com
a6f5375cb0
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2005-11-05 01:32:55 +02:00
msvensson@neptunus.(none)
b03700f9ed
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-02 15:04:16 +01:00
msvensson@neptunus.(none)
e7fd63bf0e
Portability fix, opnsrv6c
2005-11-02 14:32:50 +01:00
lars@mysql.com
c45c24ed3f
Fixed failure of NDB config retrieval.
...
1. Made sure that base64 string is terminated with NUL.
2. Made calculation of needed size for base64 string exact.
Added checks in test for the above two fixes.
2005-10-31 19:57:57 +01:00
jani@ua141d10.elisa.omakaista.fi
af50eff0d2
Merge 4.1 - 5.0
2005-10-28 02:36:19 +03:00
jani@ua141d10.elisa.omakaista.fi
cbe21a8eb6
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-27 23:43:20 +03:00
jimw@mysql.com
a01cd74647
Merge mysql.com:/home/jimw/my/mysql-4.1-12925
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-25 10:11:47 -07:00
jimw@mysql.com
e8eed35c6a
Fix incorrect casts in my_getopt code that capped the maximum of longlong
...
options to the wrong value. (Bug #12925 )
2005-10-25 10:10:53 -07:00
pem@mysql.com
3e9f3c3205
Converted mysys/base64.c into C code (not C++).
2005-10-25 11:30:43 +02:00
monty@mysql.com
3e653fb922
Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization
2005-10-25 02:27:40 +03:00
lars@mysql.com
827d745c89
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-base64
2005-10-24 20:03:40 +02:00
sergefp@mysql.com
ea3ea9ed10
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-nulls-stats-r2
2005-10-23 02:49:57 +04:00
sergefp@mysql.com
e3f623d6e8
BUG#9622: post-review-fixes: better comments
2005-10-23 02:46:10 +04:00
sergefp@mysql.com
15a78334c3
BUG#9622, stage 2, work together with fix for BUG#12232:
...
added "nulls_ignored" index statistics collection method for MyISAM tables.
(notification trigger: this is about BUG#9622).
2005-10-21 06:29:17 +04:00
bar@mysql.com
6c258beb2d
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-10-20 11:12:34 +05:00
bar@mysql.com
af3d8bd4ad
charset.c:
...
Bug#13238 mysqldump and mysqladmin hangs
Avoid recursion into init_available_charsets.
Serg's version didn't work for me: I got
double mutex locking.
Pushing this version instead
(It was approved by Serg anyway)
2005-10-20 10:30:51 +05:00
aivanov@mysql.com
2a7c88c50d
Merge mysql.com:/home/alexi/mysql-4.1
...
into mysql.com:/home/alexi/dev/mysql-4.1-4375
2005-10-19 21:07:08 +04:00
aivanov@mysql.com
e203a42dfc
Fix for BUG#4375: Windows specific directories are copied
...
during replication.
Modified my_dir(). Now this function skips hidden and system
files which sometimes are created by Windows.
NOTE. The fix is similar to the previuos one (05 July 2004)
except for correct setting of the 'attrib' variable value
(within the previous fix this variable was left uninitialized
when my_dir() was called with My_flags & MY_WANT_STAT == 0).
2005-10-19 18:01:23 +04:00
lars@mysql.com
588add2667
WL#2835: Base64
...
Fixes after Jonas review
2005-10-18 16:18:08 +02:00
lars@mysql.com
0abcffcb5d
WL#2835: Base64 mysys functions
2005-10-14 01:14:23 +02:00
jani@ua141d10.elisa.omakaista.fi
2dd1e4f94e
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-10-13 18:23:53 +03:00
guilhem@mysql.com
621e28cbe1
Building with compile-pentium-valgrind-max (without safemalloc) defines my_free() without flags,
...
so a typo on flags will go unnoticed; I put flags in this my_free() definition (as a no-op which
will still make the compiler check correctness of the flags). Applied: this caught a typo in my_realloc.c. Kindly approved by Konstantin and Mats.
2005-10-13 00:24:14 +02:00
monty@mysql.com
5513ab69b7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-10-12 00:59:52 +03:00
monty@mysql.com
f5fdf3e87a
Reviewing new pushed code
...
- CHAR() now returns binary string as default
- CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR()
- Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
(Some old systems returns ETIME and it's safer to test for both values
than to try to write a wrapper for each old system)
- Fixed new introduced bug in NOT BETWEEN X and X
- Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed
- Use octet2hex() for all conversion of string to hex
- Simplify and optimize code
2005-10-12 00:58:22 +03:00
jimw@mysql.com
c8a6c2c614
Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how
...
signal handlers are set up, the blocking flags for sockets are set,
and which thread-related functions are used. (Bug #8731 )
2005-10-11 09:12:12 -07:00
serg@serg.mylan
2e2d18b7cf
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2005-10-09 19:10:19 +02:00
serg@serg.mylan
ba169f81e3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-10-08 16:59:41 +02:00
serg@serg.mylan
e91712d9bb
pthread_handler_decl() changed to be ctags-friendly
...
(and contain extern "C" when necessary)
2005-10-08 16:39:55 +02:00
monty@mysql.com
17d7ba931d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-10-08 03:37:23 +03:00
jani@ua141d10.elisa.omakaista.fi
770b9ef34d
Fixed a bug in argument sending to get_one_option.
...
Fixed documentation for findopt().
Cleaned code a bit.
2005-10-06 22:09:15 +03:00
monty@mysql.com
78e828d32f
Review of code pushed since last 5.0 pull:
...
Ensure that ccache is also used for C programs
mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode
mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter
Fixed test cases by adding missing DROP's and rename views to be of type 'v#'
Removed MY_UNIX_PATH from fn_format()
Removed current_db_used from TABLE_LIST
Removed usage of 'current_thd' in Item_splocal
Removed some compiler warnings
A bit faster longlong2str code
2005-10-06 17:54:43 +03:00
tomas@poseidon.ndb.mysql.com
620b7bafb0
Merge
2005-10-06 10:54:07 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
ae745ef283
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
2005-09-30 15:29:01 +03:00
jonas@perch.ndb.mysql.com
78ba02f26e
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-30 13:18:31 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
26b3ef7f44
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
2005-09-30 13:56:32 +03:00
joerg@mysql.com
ac259199e0
Merge mysql.com:/M50/noserver-5.0 into mysql.com:/M50/mysql-5.0
2005-09-30 12:49:14 +02:00
joerg@mysql.com
c90673de8b
Change "mf_keycache.c" so that it can be compiled without thread support (bug#11680):
...
"configure --without-server" (without giving "--enable-thread-safe-client").
2005-09-30 12:44:45 +02:00
jonas@perch.ndb.mysql.com
b43d0f0495
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-30 12:25:39 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
43b544a968
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
2005-09-30 12:36:23 +03:00
jonas@perch.ndb.mysql.com
21153069fb
export forced_defaults_file using global variable defaults_file
...
analog with defaults_extra_file and defaults_grouop_suffix
2005-09-30 09:54:53 +02:00
msvensson@neptunus.(none)
fbf4a5e079
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-28 11:34:53 +02:00
msvensson@neptunus.(none)
1105d4293d
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/fix_mysqltest/my41-fix_mysqltest
2005-09-27 16:48:41 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
acf218b708
Several fixes revelaled by Intel compiler.
2005-09-23 16:47:08 +03:00
msvensson@neptunus.(none)
00bcf8cd8e
Bug #7037 Test "mysql_protocols" fails on Solaris 8 + 9 /x86
2005-09-23 14:07:31 +02:00
msvensson@neptunus.(none)
7ba13b16bd
BUG#7037 MySQL Bugs: #7037 : Test "mysql_protocols" fails on Solaris 8 + 9 /x86
2005-09-23 09:47:41 +02:00
konstantin@mysql.com
2d4c54ba1b
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-09-23 00:46:59 +04:00
konstantin@mysql.com
6f8d3c4844
A fix and a test case for Bug#6513 "Test Suite: Values inserted by using
...
cursor is interpreted latin1 character and Bug#9819 "Cursors: Mysql Server
Crash while fetching from table with 5 million records."
A fix for a possible memory leak when fetching into an SP cursor
in a long loop.
The patch uses a common implementation of cursors in the binary protocol and
in stored procedures and implements materialized cursors.
For implementation details, see comments in sql_cursor.cc
2005-09-22 02:11:21 +04:00
serg@serg.mylan
306aa15391
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-merged
2005-09-21 17:42:44 +02:00
serg@serg.mylan
a083ff160e
merged
2005-09-21 13:53:22 +02:00