wax@mysql.com
625b57b556
Move MI_SORT_PARAM and BUFFPEK to myisamdef.h, delete KEY_STORE, change functions
...
of store keys to temp. file
2002-11-17 05:41:42 +05:00
serg@serg.mysql.com
f2aab61a60
Merge serg.mysql.com:/usr/home/serg/Abk/mysql
...
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-11-17 00:36:28 +01:00
serg@serg.mysql.com
361db3ed44
Delete: include/.my_sys.h.swp
2002-11-17 00:35:13 +01:00
serg@serg.mysql.com
08e6939254
typelib.h is required by mysql.h and should be installed
2002-11-17 00:31:57 +01:00
bell@sanja.is.com.ua
f3ad93d3c1
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
2002-11-16 23:30:14 +02:00
monty@mashka.mysql.fi
1a96948e81
Small improvement to alloc_root
...
Add support for LIMIT # OFFSET #
Changed lock handling: Now all locks should be stored in TABLE_LIST instead of passed to functions.
Don't call query_cache_invalidate() twice in some cases
mysql_change_user() now clears states to be equal to close + connect.
Fixed a bug with multi-table-update and multi-table-delete when used with LOCK TABLES
Fixed a bug with replicate-do and UPDATE
2002-11-16 20:19:10 +02:00
bell@sanja.is.com.ua
7a9f47759e
basic row Items (SCRUM)
2002-11-15 20:32:09 +02:00
bar@bar.mysql.r18.ru
41554da7ff
move like_range into CHARSET_INFO structure
2002-11-15 11:44:23 +04:00
wax@mysql.com
8827109cd0
Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4sm
2002-11-15 00:18:37 +05:00
wax@mysql.com
e91d1b2cbe
Add shared memory protocol and option --protocol
2002-11-15 00:16:30 +05:00
bar@bar.mysql.r18.ru
76ed2fc40a
removed unused function
...
some bug fixes
2002-11-14 16:47:48 +04:00
bar@bar.mysql.r18.ru
237e2ca001
New wildcmp() function in CHARSET_INFO structure
2002-11-14 16:07:29 +04:00
monty@mashka.mysql.fi
7a70332836
Portability fix when using -DBIG_TABLES
2002-11-14 12:21:36 +02:00
bell@sanja.is.com.ua
b724f02cd4
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-14 00:26:40 +02:00
bell@sanja.is.com.ua
41d9311621
fixed cyclic reference bug
2002-11-14 00:26:18 +02:00
bar@bar.mysql.r18.ru
f628df0768
Some macros to make life easier
2002-11-13 17:58:07 +04:00
bar@bar.mysql.r18.ru
ae7d6838b2
Preparing to embed string to number conversion functions into charset structure
2002-11-13 17:13:29 +04:00
bell@sanja.is.com.ua
57541e72c5
fixed 2 typo in BUG_TABLES using
...
remuved 'unstable' variable from test
2002-11-12 15:25:09 +02:00
lenz@mysql.com
549aeb3ac4
include/mysisampack.h
...
- fixed typo: mi_rowkorr(T,A) -> mi_rowkorr(T)
2002-11-12 13:28:26 +01:00
lenz@mysql.com
40027b8cff
include/myisampack.h
...
- fixed Typo: BIG_TABLE -> BIG_TABLES
2002-11-12 13:21:44 +01:00
ram@mysql.r18.ru
206a59c8c3
fix for HEAP rb-tree indexes and BIG_TABLES problem (serg: thanks for discovery)
2002-11-11 13:34:47 +04:00
bar@bar.mysql.r18.ru
abd3427150
New field snprintf() in CHARSET_INFO structure
2002-11-10 16:14:39 +04:00
monty@hundin.mysql.fi
b0fae584b9
Portability fixes for HP compiler and HPUX11
2002-11-09 13:26:46 +02:00
monty@butch.
890b39bb68
merge
2002-11-07 12:49:01 +02:00
monty@butch.
a2bdf9265f
Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes.
2002-11-07 03:54:00 +02:00
gluh@gluh.(none)
98579955d6
Merge sgluhov@work.mysql.com:/home/bk/mysql-4.0
...
into gluh.(none):/home/gluh/mysql-4.0.bklast
2002-11-06 12:19:06 +04:00
peter@mysql.com
ecedc7ac35
More work on secure authentication. Commit for merge
2002-11-05 20:21:55 +03:00
gluh@gluh.(none)
7bf903ea10
Error code for ssl connection
...
Fix bug when server hang(with SSL, with modified libmysql)
Add options master-ssl-capath and master-ssl-cipher
Add some error checking(SSL)
2002-11-05 12:05:58 +04:00
peter@mysql.com
26a1d8885d
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-31 13:02:29 +03:00
peter@mysql.com
cc18dc7291
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-30 18:03:09 +03:00
Sinisa@sinisa.nasamreza.org
26c6d970d9
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-10-30 16:59:49 +02:00
Sinisa@sinisa.nasamreza.org
5fbd7b63c5
changes for mysqladmin debug
...
and a bug fix for derived tables
2002-10-30 16:52:12 +02:00
vva@genie.(none)
4d22168d68
Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
...
into genie.(none):/home/vva/work/mysql-4.1.help/mysql-4.1.help_res
2002-10-30 17:40:26 +04:00
vva@genie.(none)
30a59d34ab
addition correction for 'help' command
2002-10-30 17:38:07 +04:00
bar@bar.mysql.r18.ru
03e7fc3180
date and time fields now have charset arg in constructor
...
my_charset_latin1
2002-10-30 17:09:37 +04:00
monty@mashka.mysql.fi
bb7f37ab2e
merge
2002-10-29 23:54:37 +02:00
monty@mashka.mysql.fi
5343d4c969
Added --skip-safemalloc to mysqltest
...
Added bug fix from 3.23 for AIX 4.3.3 and gcc 3.x
Small change in EXCHANGE output
Propagate open-files-limit from mysqld_safe -> mysqld
Fixed speed bug in GROUP BY
Added quotes around database name in CREATE DATABASE db_name (for binary log)
2002-10-29 22:56:30 +02:00
peter@mysql.com
bdca1d10a0
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-29 10:36:43 +03:00
vva@genie.(none)
9adf688be6
add help command on server side
2002-10-28 17:44:19 +04:00
peter@mysql.com
1545cbccd3
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-27 13:13:31 +03:00
serg@serg.mysql.com
2ed2594c24
Merge work:/home/bk/mysql-4.1
...
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-10-25 14:18:30 +00:00
serg@serg.mysql.com
d552ba7d8a
support for HA_READ_PREFIX_LAST_OR_PREV in headres
...
full support for HA_READ_PREFIX_LAST_OR_PREV in MyISAM
protected by #if NOT_IMPLEMENTED_YET in opt_range.cc as not all table handlers support it
2002-10-25 14:09:47 +00:00
bar@bar.mysql.r18.ru
95aef91521
BINARY charset is now used instead of binary_flag
2002-10-25 13:58:32 +05:00
lenz@mysql.com
9b769dbd22
- replaced all occurences of HPUX with HPUX10 (to be prepared for eventual
...
differences in HPUX11)
2002-10-24 14:30:25 +02:00
peter@mysql.com
3d32b14de5
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-23 23:28:36 +04:00
bar@bar.mysql.r18.ru
b9f5e18be1
Preparing to use my_charset_bin instead of binary_flag
2002-10-23 18:20:45 +05:00
peter@mysql.com
4825e3264d
Merge to update to recent tree version
2002-10-20 00:09:11 +04:00
peter@mysql.com
37245fd17f
More work on secure connection protocol. commited in order to do the sync with new large pushed
...
bunch.
2002-10-19 23:18:31 +04:00
monty@hundin.mysql.fi
a975cecf42
Merge
2002-10-14 17:50:44 +03:00
serg@serg.mysql.com
fcb8bc061d
merged
2002-10-14 11:36:48 +00:00
monty@narttu.mysql.fi
3c7f6a9835
merge
2002-10-14 12:07:16 +03:00
serg@serg.mysql.com
f7ca3212ea
Merge work:/home/bk/mysql-4.1
...
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-10-12 17:40:57 +00:00
peter@mysql.com
50021f6f08
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-10 17:44:13 +04:00
bar@bar.mysql.r18.ru
a0dd5febfc
Move hash_sort and hash_caseup into CHARSET_INFO for all charsets
2002-10-10 16:52:22 +05:00
peter@mysql.com
dccfa094e6
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-10 15:31:04 +04:00
bar@bar.mysql.r18.ru
11a93ede41
Some reorganization to use less memory as well as to hide some implementation
...
aspects into *.c files from *.h files. Some steps to get closer to generating
*.c files from *.conf files again.
2002-10-10 15:52:32 +05:00
peter@mysql.com
5e873b2075
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-09 22:02:43 +04:00
bar@bar.mysql.r18.ru
50c391538a
my_sortcmp -> my_strnncoll
2002-10-09 16:33:35 +05:00
peter@mysql.com
9731dbc3fd
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-09 14:50:19 +04:00
bar@bar.mysql.r18.ru
954a47b95a
Simple charsets now have strncoll() field too
2002-10-09 15:40:57 +05:00
monty@hundin.mysql.fi
adf7809c04
Fix for build problem on AIX
2002-10-09 13:04:03 +03:00
peter@mysql.com
6e91d6a8e3
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-09 10:10:15 +04:00
monty@narttu.mysql.fi
da2abaf887
Portability fixes to be able to compile MySQL with VC++
2002-10-08 22:28:24 +03:00
serg@serg.mysql.com
e65536b147
--tmpdir=dir1:dir2:... support in myisamchk
2002-10-08 14:34:04 +00:00
serg@serg.mysql.com
3217f2cc06
support for --tmpdir=dir1:dir2:...
2002-10-08 12:39:37 +00:00
ram@mysql.r18.ru
d987b235c2
Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
...
into mysql.r18.ru:/usr/home/ram/mysql-4.1
2002-10-07 17:51:05 +05:00
ram@mysql.r18.ru
2e1a0c031a
auto_increment for heap tables
...
test case
2002-10-07 17:49:03 +05:00
peter@mysql.com
c4ea39d810
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-06 13:43:42 +04:00
peter@mysql.com
d21402052c
One more commit to do the merge of new 4.1 tree
2002-10-06 13:42:16 +04:00
bell@sanja.is.com.ua
199f667c19
merging
2002-10-04 14:15:59 +03:00
peter@mysql.com
de57e9ba35
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-03 22:48:53 +04:00
monty@mashka.mysql.fi
2e52a69b12
Merge work:/my/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
2002-10-03 16:56:09 +03:00
peter@mysql.com
0dc8dc2d5d
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-03 15:07:03 +04:00
bar@bar.mysql.r18.ru
2dae97b139
Failed to compile on FreeBSD:
...
no ulong type, one should use unsigned long instead
2002-10-03 13:12:31 +05:00
peter@mysql.com
66b1435ee2
Merging...
2002-10-03 00:13:08 +04:00
peter@mysql.com
f1155a98a4
Changeset to deal with 4.1 -> 4.0 merge
2002-10-02 23:43:27 +04:00
monty@mashka.mysql.fi
0f39457613
Merge with 4.0.4
2002-10-02 17:55:12 +03:00
monty@mashka.mysql.fi
d69250a969
Fixes and code cleanups after merge with 4.0.3
...
Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()
Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22
2002-10-02 13:33:08 +03:00
lenz@mysql.com
3cf7acb756
- Applied required modifications for automake 1.5
...
- some additional small fixes
- added "depcomp" for automake 1.5
2002-10-01 21:57:10 +02:00
lenz@mysql.com
019b5ab7b4
- backported gcc 3.0 linking fix from 4.0
...
- some cosmetical fixups (typos, comments)
2002-09-24 22:24:30 +02:00
monty@mashka.mysql.fi
efaaf0b4b8
Updated VC++ project files for 4.0.4
...
Only write short usage if one starts mysqldump without any options
Added query cache on windows
Added error message if one can't read privilege tables
2002-09-24 17:11:59 +03:00
monty@mashka.mysql.fi
ce4b584a85
Increased max possible max_allowed_packet to 1G
...
Small optimization to not do external locking of temporary MyISAM tables.
2002-09-19 17:49:41 +03:00
monty@mashka.mysql.fi
f638ee6df9
Added code to flush a bulk_insert index.
...
This fixes a bug when doing multi-row inserts on table with an auto_increment key that is not in the first key segment.
2002-09-18 21:04:49 +03:00
monty@mashka.mysql.fi
dfd0f82b93
Update mysql-test results after merge
2002-09-18 02:21:29 +03:00
monty@mashka.mysql.fi
7f55d92637
fixed so that --ssl and --skip-ssl works with the MySQL clients.
...
Fixed core dump bug when sending wrong string to AES_DECRYPT()
2002-09-17 23:46:53 +03:00
monty@mashka.mysql.fi
c85c33a5c1
Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables
...
Fixed bug in SELECT ... ORDER BY ... LIMIT
Fixed bug in ALTER TABLE and RENAME TABLE with --lower-case-table-names
Fixed hang when using --with-openssl
2002-09-16 15:55:19 +03:00
monty@mashka.mysql.fi
f3a186c905
Portability fixes.
...
Improve mysql-test to be more robust.
Fix that GRANT doesn't delete SSL options
Change innobase_flush_log_at_trx_commit to uint.
Don't rotate logs if we read a rotate log entry from the master.
2002-09-11 06:40:08 +03:00
monty@mashka.mysql.fi
0281a6b160
Fixed searching after ssl directories.
...
Fixed that GRANT ... REQUIRE options are not forgot when doing new GRANT
Changed fn_ext to point at first '.' after directory.
FLUSH LOGS removed numerical extension for all future update logs.
Fixed the mysqld --help reports right values for --datadir and --bind-address
--log-binary=a.b.c now properly strips of .b.c
Fix that one can DROP UDF functions that was not loaded at startup
Made AND optional in REQUIRE
Added REQUIRE NONE
2002-09-05 16:17:08 +03:00
bell@sanja.is.com.ua
d9989c635e
merged
2002-09-03 10:06:10 +03:00
bell@sanja.is.com.ua
b07aaeb295
subselect with union
...
new error handling
Item_ref bug fixed
2002-09-03 09:50:36 +03:00
monty@narttu.mysql.fi
7134ffec21
Merge with 4.0.3
...
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)
2002-08-30 12:40:40 +03:00
monty@hundin.mysql.fi
e720b5a6fb
Portability fixes for windows
2002-08-28 17:00:58 +03:00
monty@hundin.mysql.fi
7dac7062fa
Changed relay_log_space to ulonglong
...
Removed compiler warnings.
2002-08-23 15:14:01 +03:00
monty@hundin.mysql.fi
03b0179af9
Use our version of RWLOCKS on UNIXWARE 7
...
More DBUG info for replication
Better error messages from replication
Fixed bug in replication code when connecting to 'localhost' (time was not released properly)
Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug)
Removed warning when setting an AUTO_INCREMENT field to NULL
2002-08-21 22:04:22 +03:00
monty@hundin.mysql.fi
f7c8bd0e47
Portability fixes for 4.0.3 build.
...
Don't update MyISAM index file on UPDATE if index is not changed
2002-08-17 18:02:56 +03:00
monty@hundin.mysql.fi
5773b6504a
Fixed bug in blocking handling when compiling with OPENSSL (caused hangup in client code)
...
Fixed bug in SELECT DISTINCT ... ORDER BY not-used-column.
Fixed bug in pthread_mutex_trylock with HPUX 11.0
2002-08-17 00:35:51 +03:00
monty@hundin.mysql.fi
65334e1c58
Fix for HPUX 11 and pthread_mutex_lock
2002-08-16 16:50:57 +03:00
monty@hundin.mysql.fi
a0e9e22320
Fixed typo so that ulonglong are properly converted to double on AIX with gcc 3.1
2002-08-16 12:50:21 +03:00
monty@hundin.mysql.fi
3ef9d44edc
merge with 3.23.52
2002-08-12 04:04:43 +03:00
monty@hundin.mysql.fi
b779b63862
Fixed problem with BIGINT and shutdown on AIX
...
Moved IF(test,column,NULL) code to 4.0
Changed mysys_priv.h to include my_pthread.h or my_no_pthread.h.
Removed some CR's in os2 files.
2002-08-12 03:28:02 +03:00