Commit graph

2113 commits

Author SHA1 Message Date
jani@ua141d10.elisa.omakaista.fi
74b8b449a4 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-28 03:26:56 +03:00
kent@mysql.com
a49940c359 Makefile.am:
Added "base64.h" to enable "make dist" to work
2005-10-28 02:17:41 +02: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
reggie@big_geek.
dec2640dbf changed define from EXTERN_C to EXTERNC so it doesn't conflict with
another macro defined in the Windows header files.
2005-10-25 23:51:05 -05:00
jani@ua141d10.elisa.omakaista.fi
3e599c0907 Imported fixes from 4.1 and 5.0 to 4.0. 2005-10-25 16:56:25 +03: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
lars@mysql.com
0abcffcb5d WL#2835: Base64 mysys functions 2005-10-14 01:14:23 +02:00
bar@mysql.com
fee9c13568 Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.b9278
2005-10-13 22:18:35 +05: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
bar@mysql.com
c229567887 Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.b9278
2005-10-13 19:19:05 +05:00
bar@mysql.com
39b0712cf7 type_binary.result, type_binary.test:
new file
mysql_fix_privilege_tables.sql, mysql_create_system_tables.sh:
  Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
Many files:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
  Adding true BINARY/VARBINARY: new pad_char structure member.
ctype-bin.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
  New strnxfrm, with two trailing length bytes.
field.cc:
  Adding true BINARY/VARBINARY.
2005-10-13 19:16:19 +05:00
ramil@mysql.com
2ffbe01127 Merge mysql.com:/usr/home/ram/work/mysql-4.0
into  mysql.com:/usr/home/ram/work/mysql-4.1
2005-10-13 12:48:30 +05: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
ramil@mysql.com
58c64aea92 memcpy_overlap() removed, as
1. it's wrong to use memcpy() for overlapped areas;
  2. we use it only once.
During merge to 4.1 will remove a memcpy_overlap() call 
from strings/ctype-tis620.c as well in order to fix 
bug #10836: ctype_tis620 test failure with ICC-compiled binaries on IA64.
2005-10-12 18:50:25 +05: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
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
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
kent@mysql.com
3af12c4776 my_pthread.h:
Let pthread_mutex_init() macro return 0 on Windows
mysql_priv.h:
  Return type is to be 'my_bool' for 'opt_enable_shared_memory'
2005-10-06 03:49:14 +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
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
aa08fd0d0a Small fixes. 2005-09-30 12:35:12 +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
kent@mysql.com
095efe48a5 Makefile.am, configure.in:
Enable "make distcheck" to work
2005-09-24 15:51:45 +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
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
3b41e3362b aftermerge fix 2005-09-21 17:38:26 +02:00
serg@serg.mylan
a083ff160e merged 2005-09-21 13:53:22 +02:00
sergefp@mysql.com
a26e1b7280 Merge mysql.com:/home/psergey/bk-trees/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-csc6030-r3
2005-09-21 02:20:55 +04:00
sergefp@mysql.com
f9475d1d15 BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index
statistics (like 4.0 did) (patch #3, with review #1 & #2 feedback addressed)
2005-09-21 02:18:29 +04:00
SergeyV@selena.
c2f734ce42 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
into  selena.:H:/MYSQL/src/#12929-mysql-4.1
2005-09-20 20:11:38 +04:00
bar@mysql.com
6424e9cce1 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.b10504
2005-09-19 09:46:25 +05:00
joerg@mysql.com
f67c7186e8 Merge the 5.0.13 clone changes up to 5.1 2005-09-16 11:02:21 +02:00
bar@mysql.com
1d12ac8849 Bug#10504
Character set does not support traditional mode
ctype_utf8.result, ctype_utf8.test:
  adding test case.
password.c, mysql_com.h
  Changeing octet2hex availability from static to public.
item_strfunc.cc:
  Result string is now checked to be well-formed.
  Warning/error is generated, depending on sql_mode.
2005-09-16 10:24:37 +05:00
SergeyV@selena.
2e9e0b33c5 Fixes bug #12929. Uses my_cgets instead of _cgets function, thus eliminating
a restriction to 255 chars for editable buffer.
2005-09-16 01:56:16 +04:00
joerg@mysql.com
8b7b6f46f3 Compile problem about "madvise()" on Solaris (bug#7156). (Patch supplied by Kent) 2005-09-15 19:00:25 +02:00
msvensson@neptunus.(none)
10eee79363 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-09-15 11:32:49 +02:00
ingo@mysql.com
18cb2e8388 Merge mysql.com:/home/mydev/mysql-4.1-4100
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-14 13:37:16 +02:00
ingo@mysql.com
6e725adc00 Bug#12920 - key_read_requests counter appears to re-set
After merge fix.
2005-09-14 13:18:16 +02:00
ingo@mysql.com
8130641e8e Merge mysql.com:/home/mydev/mysql-4.0-4000
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-09-14 10:34:41 +02:00
ingo@mysql.com
7314307762 Bug#12920 - key_read_requests counter appears to re-set
Enlarged the counter variables to ulonglong.
2005-09-14 09:56:49 +02:00