gluh@gluh.mysql.r18.ru
8d3c43880d
conflicts resolving
2003-01-31 09:43:53 +04:00
gluh@gluh.mysql.r18.ru
57a805de6c
'Replicate user variables' task
2003-01-30 21:39:54 +04:00
heikki@hundin.mysql.fi
0da4275063
config-win.h, os0proc.h, os0proc.c, srv0start.c:
...
Make AWE compilation depend on __WIN2000__
2003-01-30 18:52:45 +02:00
bar@bar.mysql.r18.ru
735399a850
Move latin1 into a separarte file
2003-01-29 17:31:20 +04:00
bar@bar.mysql.r18.ru
08129eea2b
Reorganization to restore generating charset C files from conf files
2003-01-29 15:08:09 +04:00
venu@myvenu.com
8673530904
Merge work.mysql.com:/home/bk/mysql-4.1
...
into myvenu.com:/home/venu/bk/src-4.1
2003-01-28 21:08:42 -08:00
venu@myvenu.com
b312b97aa0
Fix for windows specific errors
2003-01-28 21:02:20 -08:00
serg@serg.mysql.com
1ced5948f0
low-level error messages cleanup
2003-01-28 17:42:08 +01:00
bar@bar.mysql.r18.ru
f815e9b812
resolve
2003-01-28 15:03:33 +04:00
bar@bar.mysql.r18.ru
a292d4f632
New "fill" function in charset_info_st structure
2003-01-28 14:58:06 +04:00
monty@mashka.mysql.fi
6b71279382
merge
2003-01-28 09:02:51 +02:00
monty@mashka.mysql.fi
689578a099
Fixes for Netware
...
Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL
2003-01-28 08:38:28 +02:00
igor@hundin.mysql.fi
6fea54dd8d
my_pthread.h:
...
Missing merge in changeset 1.1435
2003-01-28 05:34:32 +02:00
venu@hundin.mysql.fi
961d2c3e89
Introduced a scalable key cache management.
...
Added some fields to the st_my_thread_var structure to be
able to link such structures into a list.
2003-01-28 03:37:57 +02:00
serg@serg.mysql.com
f29224c6fe
fixed bug in parallel repair
2003-01-26 12:27:29 +01:00
venu@myvenu.com
6af9b46e5f
Remove un-used variables
...
Pure coverage tests (debug only)
2003-01-25 22:52:45 -08:00
venu@myvenu.com
67579f4c48
MYSQL_TIME handling - client
...
Remove get_binary_length
Enable the clients to work wih date,time and ts directly with binary protocol
2003-01-23 22:36:27 -08:00
monty@mashka.mysql.fi
9af5e6b70a
Avoid memory overruns when buffer_length is too small (when fetching binary data in prepared statements)
2003-01-23 21:49:28 +02:00
serg@serg.mysql.com
274df58118
--ft_stopword_file command-line option
2003-01-23 13:20:37 +01:00
venu@myvenu.com
93d4055e21
Remove bind_length + Fix the client-test
2003-01-22 01:30:13 -08:00
monty@mashka.mysql.fi
7436e9ec97
Merge
2003-01-21 21:28:51 +02:00
monty@mashka.mysql.fi
25c393a12e
Portability fixes (for windows)
...
Some changes to the prepared statement protocol to make it easier to use and faster.
2003-01-21 21:07:59 +02:00
serg@serg.mysql.com
3f55032c12
merged
2003-01-21 19:37:38 +01:00
serg@serg.mysql.com
0dff67cba2
Two-level index structure for FULLTEXT indexes
2003-01-21 19:24:34 +01:00
hf@deer.mysql.r18.ru
389680e04e
Conflicts resolving
2003-01-20 18:59:45 +04:00
hf@deer.mysql.r18.ru
1f6b615677
SCRUM
...
embedded-related changes
2003-01-20 18:47:25 +04:00
venu@myvenu.com
e0a79dc112
Windows build fix
2003-01-18 14:04:34 -08:00
venu@myvenu.com
a39da98d0d
Initial multi query execution support
2003-01-18 11:53:38 -08:00
monty@mashka.mysql.fi
529e4a76c5
Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
2003-01-18 19:31:37 +02:00
vva@eagle.mysql.r18.ru
69b722d7d9
changes for readline/libedit configuration
2003-01-18 20:28:48 +04:00
monty@mashka.mysql.fi
8acc22296c
Change client_flag to unsigned long (16 -> 32 bits) to handle more options.
...
Don't use new password format if mysql.user has old format
tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
Portability fixes for Windows
2003-01-18 16:39:21 +02:00
monty@work.mysql.com
36caf801ce
Removed and added back typelib.h to get rid of \r that bk did not allow me to remove.
2003-01-18 02:36:24 +01:00
monty@mashka.mysql.fi
76f146a175
Merge with 4.0.9
2003-01-18 03:13:37 +02:00
bar@bar.mysql.r18.ru
2a41e291dc
New scan() function in CHARSET_INFO structure (not used yet)
2003-01-17 18:14:54 +04:00
venu@myvenu.com
51eb44c9e6
Merge work.mysql.com:/home/bk/mysql-4.1
...
into myvenu.com:/home/venu/bk/src-4.1
2003-01-16 15:47:46 -08:00
venu@myvenu.com
370b88f94c
Implement store_result (read_binary_rows & mysql_stmt_store_result)
2003-01-16 15:00:22 -08:00
bar@bar.mysql.r18.ru
4f9d82700d
strnto family functions now return error in a new argument
2003-01-16 17:17:07 +04:00
bar@bar.mysql.r18.ru
5743f94b57
All charsets now have strnxfrm.
...
Some function names have been renamed to be more self-descriptive
2003-01-15 18:06:07 +04:00
hf@deer.mysql.r18.ru
96089e2b3a
resolving conflicts
2003-01-15 13:15:35 +04:00
hf@deer.mysql.r18.ru
c59bff7c96
SCRUM
...
embedded library trimming
2003-01-15 12:11:44 +04:00
bell@sanja.is.com.ua
9e9ea3504f
after merging fixing
2003-01-14 18:00:34 +02:00
monty@mashka.mysql.fi
22b7e67b0b
merge
2003-01-14 14:33:10 +02:00
monty@mashka.mysql.fi
7e9b27eaf5
Updates for multi-byte character sets
...
(Note: test 'union' fails, but Sanja promised to fix this)
2003-01-14 14:28:36 +02:00
bar@bar.mysql.r18.ru
3523650ac8
Charset loading has been moved to /string library
2003-01-14 13:36:22 +04:00
monty@mashka.mysql.fi
8dd439e751
Guard against compiling without -fno-exceptions
...
Allocate bigger default thread stack because of problems with glibc
Fixed bug in UPDATE ... not_null_field=expression_that_returns_null
Fixed bug in replication when using auto_increment and LOAD DATA INFILE
2003-01-14 11:27:26 +02:00
venu@myvenu.com
045b2f2336
Remove/change unwanted variables in client protocol
...
Add missed mysql_stmt_affected_rows()
sql_yacc.yy : Fix the compilation error .. bison 1.75
2003-01-09 17:56:34 -08:00
venu@myvenu.com
389aa45c9c
Merge venu@work.mysql.com:/home/bk/mysql-4.1
...
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-01-09 16:54:38 -08:00
monty@mashka.mysql.fi
c9dc5a206b
Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
2003-01-09 22:43:23 +02:00
venu@myvenu.com
a9b2d52573
Merge work.mysql.com:/home/bk/mysql-4.1
...
into myvenu.com:/home/venu/bk/src-4.1
2003-01-09 09:55:45 -08:00
monty@mashka.mysql.fi
f8e660d88c
merge with 4.0.9
...
To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys
2003-01-09 03:55:26 +02:00
monty@mashka.mysql.fi
3c08da957e
Don't count NULL values in cardinalty for MyISAM tables.
...
Free row buffer cache after each query for MyISAM tables.
Added table join option FORCE INDEX
Fixed core dump bug when connecting with hostname that could not be resolved.
2003-01-09 02:19:14 +02:00
bar@bar.mysql.r18.ru
9a99ac89e5
New function to search for charset using charset name rather than collation name
2003-01-08 15:39:15 +04:00
venu@myvenu.com
c22219563a
Code cleaup to fix the conversion routines - binary protocol
2003-01-07 18:57:39 -08:00
monty@mashka.mysql.fi
446a6b934f
Enchanced my_once..() functions.
...
Cleaned up charset.c
Removed non fatal memory leak in charset.c
2003-01-07 23:32:25 +02:00
monty@mashka.mysql.fi
803dff1002
Merge with 4.0.8
2003-01-06 02:04:52 +02:00
monty@mashka.mysql.fi
f9772317ee
merge
2003-01-04 15:40:55 +02:00
monty@mashka.mysql.fi
6d6f051178
Added support for DROP TEMPORARY TABLE
...
Removed mysql_warnings() API function.
Post merge fixes.
2003-01-04 15:37:20 +02:00
monty@mashka.mysql.fi
6d5ad61a11
Added support for max_allowed_packet in option files read by mysql_option()
...
Extended max_allowed_packet for clients to 1G
Fixed bug in sending compressed rows >= 16M
Fix bug in skiping too long packets from clients.
Added checking of wrong command number sent by client.
2003-01-04 15:17:16 +02:00
bar@bar.mysql.r18.ru
a172e5ad2a
Some changes to separate charset and collation terms
2003-01-04 14:12:20 +04:00
peter@mysql.com
7aba78533b
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2003-01-03 15:39:16 +03:00
venu@myvenu.com
5f4a7c1971
Missed commit
2003-01-03 04:12:34 -08:00
bar@bar.mysql.r18.ru
f6d427d7df
User data
2003-01-03 12:30:01 +04:00
monty@mashka.mysql.fi
07daf3169e
Merge with 4.0.8
2003-01-03 00:04:33 +02:00
peter@mysql.com
3b425c8ba5
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2003-01-01 20:11:18 +03:00
bar@bar.mysql.r18.ru
eb87b8a1bd
XML parser
2002-12-31 13:00:41 +04:00
peter@mysql.com
6e35c1a95e
Add proper error message for old client connecting new server using user which has password in
...
new format SCRUM
2002-12-26 19:12:57 +03:00
bar@bar.mysql.r18.ru
852508a4cf
mysql_com.h:
...
ulong fails to compile on FreeBSD. Peter, alsways use "unsigned long" instead!!!
2002-12-20 16:21:22 +04:00
hf@deer.mysql.r18.ru
8a205e4ba3
Merge
2002-12-19 14:57:24 +04:00
bar@bar.mysql.r18.ru
c3053148f4
BINARY_FLAG has been restored.
...
It's needed by ODBC code.
2002-12-19 14:36:05 +04:00
hf@deer.mysql.r18.ru
bb67600df4
Merging
2002-12-17 19:57:23 +04:00
vva@eagle.mysql.r18.ru
f3871cf9b4
Many init commands on connect
2002-12-17 19:13:07 +04:00
hf@deer.mysql.r18.ru
e3b3b68307
Big purge about embedded library (scrum)
2002-12-16 17:33:29 +04:00
hf@deer.mysql.r18.ru
3517febe97
Resolving merge conflicts
2002-12-12 12:49:56 +04:00
bar@bar.mysql.r18.ru
a345447ad0
Preparing for charset dependant int10_to_str
2002-12-11 12:30:05 +04:00
serg@serg.mysql.com
94cb1daa52
ANALYZE for MERGE
2002-12-10 00:06:05 +01:00
serg@serg.mysql.com
b42eff16cb
bulk insert code optimized
2002-12-07 22:40:20 +01:00
venu@myvenu.com
9100688c17
item.cc:
...
Fix for save_in_field to take extra bool argumnet (4.0 merge compatibility)
2002-12-06 23:39:11 -08:00
monty@mashka.mysql.fi
f1d35b29bc
merge fix
2002-12-06 21:15:05 +02:00
monty@mashka.mysql.fi
859b688476
Merge with 4.0.6
2002-12-05 19:38:42 +02:00
peter@mysql.com
1d920529a8
SCRAM Remove spaces from most changed files.
...
This alters not only my code so it looks like I'm not only one adding the spaces.
2002-12-05 01:14:51 +03:00
lenz@mysql.com
0db5f142dd
- portability patch to work around bugs in the HP compiler's "inline"
...
handling (backport from 4.0 tree)
2002-12-04 19:16:45 +01:00
serg@serg.mysql.com
44db958ba2
new client error added: CR_MALFORMED_PACKET
2002-12-04 17:37:51 +01:00
peter@mysql.com
5fa02daa69
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-12-04 16:26:29 +03:00
bell@sanja.is.com.ua
91bd1e4cc5
fixed error message
2002-12-04 01:32:45 +02:00
Sinisa@sinisa.nasamreza.org
5483796c50
Proper handling of ORDER BY table.column in UNION's
2002-12-02 20:18:51 +02:00
peter@mysql.com
1bf744911f
Megrge new changes in...
2002-12-01 11:18:19 +03:00
peter@mysql.com
a24258375a
SCRUM: Montymise code
...
fix mysql_change_user() for old clients
2002-11-30 20:58:53 +03:00
peter@mysql.com
54ff0efe7c
SCRUM: Secure auth
...
Implement mysql_change_user
Get rid of double user search at authentication
Some cleanups
2002-11-30 16:31:58 +03:00
peter@mysql.com
08f51eaedd
Merging....
2002-11-29 22:03:14 +03:00
peter@mysql.com
7e6977808f
Correct bug which exposed itself in rpl000017
...
Commit for merge
2002-11-29 21:34:13 +03:00
monty@mashka.mysql.fi
6603d75213
New multi-table-update code
...
New (simpler) internal timestamp handling.
More debuging to heap tables.
Small cleanups to multi-table-delete
false -> 0 and true -> 1 (We should use TRUE and FALSE)
2002-11-29 16:40:18 +02:00
Sinisa@sinisa.nasamreza.org
5b7a2f56ee
many, many changes
2002-11-29 15:22:47 +02:00
hf@genie.(none)
5e8b27c0d3
Pull conflicts resolutions
2002-11-29 12:35:48 +04:00
bar@bar.mysql.r18.ru
24cf562ec5
mysql.h:
...
renamed arg name to avoid a warning that it shadows global variable
2002-11-29 10:17:43 +04:00
wax@mysql.com
8efd5648ef
Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4mi
2002-11-29 02:51:08 +05:00
bell@sanja.is.com.ua
0b8054ac8c
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-28 20:59:21 +02:00
bell@sanja.is.com.ua
fcb0b8815b
merging
2002-11-28 20:12:14 +02:00
venu@myvenu.com
aafcbf3450
Merge work.mysql.com:/home/bk/mysql-4.1
...
into myvenu.com:/home/venu/bk/src-4.1
2002-11-28 10:02:01 -08:00
venu@myvenu.com
5aff325ce3
Get rid of pbool from my_list.h; and avoid using the my_global.h for clients
2002-11-28 09:56:26 -08:00
bell@sanja.is.com.ua
b8b7d0b03b
fixed * without tables in IN bug
...
fixed sunction-test select in IN bug
fixed unions in subselect bug
2002-11-28 19:29:26 +02:00