mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
11231 commits 2784 branches 343 tags 1.6 GiB
Commit graph

1127 commits

Author SHA1 Message Date
bar@bar.mysql.r18.ru
1c5b5ee0ec Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2003-09-19 15:19:15 +05:00
bar@bar.mysql.r18.ru
e0a0790ebb Fixed that multibyte charsets didn't honor multibyte 
sequence boundaries in functions LIKE and LOCATE in
the case of "binary" collation. Comparison was done
like if the strings were just a binary strings without
character set assumption.
 2003-09-19 15:18:19 +05:00
hf@deer.(none)
a2dbfaefa3 SCRUM 
embedded library
hash_insert renamed to my_hash_insert to avoid name intersection
with another libraries
is there better idea?
 2003-09-19 14:44:31 +05:00
hf@deer.(none)
cda32e123c SCRUM 
prepared statements in embedded library.
some fixes after testing
 2003-09-19 14:05:28 +05:00
hf@deer.(none)
e89e3ff753 SCRUM 
embedded library
some dirty places cleaned:

uint removed from mysql.h as Miguel suggested
empty_string renamed as my_empty_string to get rid of name's intersections
using embedded library
 2003-09-18 18:58:02 +05:00
hf@deer.(none)
0e059dcb74 SCRUM: 
embedded library
I decided to get rid of #define mysql_some_function in mysql.h
It puzzles users and makes problems with dynamic libraries

Finally, there are only two functions left, that are covered with
the #define-s and it won't hurt performance at all
 2003-09-18 18:28:42 +05:00
hf@deer.(none)
7dd4cb58d6 SCRUM 
prepared statements in embedded library
 2003-09-18 12:25:00 +05:00
hf@deer.(none)
ccc28f46de Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.stmt
 2003-09-17 20:58:31 +05:00
hf@deer.(none)
ddbca4176d SCRUM: 
prepared statements in embedded library
 2003-09-17 20:48:53 +05:00
bar@bar.mysql.r18.ru
731b8392ee Charset number is now stored into error.sys by comp_err and loaded by mysqld. 2003-09-17 16:22:58 +05:00
hf@deer.(none)
117d18335a Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.stmt
 2003-09-17 15:18:48 +05:00
hf@deer.(none)
7a763f3fe3 SCRUM 
prepared statements in embedded library
 2003-09-17 15:18:18 +05:00
greg@mysql.com
7facccf322 BUG #1305: ISAM table handler should not be compiled by default under 4.1 2003-09-17 00:30:29 -04:00
hf@deer.(none)
efd2e122ef Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.stmt
 2003-09-16 16:36:13 +05:00
hf@deer.(none)
6dd77126b4 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.stmt
 2003-09-16 16:07:00 +05:00
hf@deer.(none)
bf017a2eb0 SCRUM 
Prepared statements in embedded server
Several changes in library code with two goals:
to make mysql_prepare_stmt working in embedded server
to get rid of #define mysql_interface_func mysql->methods->interface_func
in user's interface
 2003-09-16 16:06:25 +05:00
bar@bar.mysql.r18.ru
83c6946232 Bug fix: 
http://bugs.mysql.com/bug.php?id=1264
 2003-09-16 15:43:17 +05:00
dlenev@mysql.com
2c24b2e9b4 Manual merge after commiting START SLAVE UNTIL 2003-09-14 01:57:09 +04:00
dlenev@dlenev.mshome
c0cfae1c8d Implemented support for START SLAVE UNTIL (WL#868) 2003-09-14 00:13:41 +04:00
dlenev@mysql.com
1c11077d60 Replaced deprecated since OpenSSL 0.9.7 des_ calls and types with 
their newer DES_ versions.
Provided macros for backward compatibility.
 2003-09-12 22:33:43 +04:00
hf@deer.(none)
e63e2229b6 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.stmt
 2003-09-12 19:36:42 +05:00
hf@deer.(none)
9f3996cde9 SCRUM: 
#977 Prepared statements in embedded library
 2003-09-12 19:35:34 +05:00
monty@mashka.mysql.fi
7538242e4f merge with 4.1 tree 2003-09-11 20:31:40 +03:00
monty@mashka.mysql.fi
73f66f68fd merge with 4.0.15 2003-09-11 20:24:14 +03:00
monty@mashka.mysql.fi
45aa92c574 After merge fixes. 
Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
 2003-09-11 19:06:23 +03:00
hf@deer.(none)
f434b329f5 SCRUM 
embedded&client library
some fixes: zero at the end of the data added
mysql_list_fields became 'virtual'
 2003-09-11 09:46:31 +05:00
monty@mashka.mysql.fi
223a966763 Remove not used define (my_strxfrm) 2003-09-11 06:09:34 +03:00
bell@sanja.is.com.ua
ad07ffbf6d merge 2003-09-09 22:26:19 +03:00
monty@mashka.mysql.fi
99490870e6 Cleaned up last bug fixes 
Fix bug in SHOW GRANTS when there is a column privilege but no table privilege
 2003-09-09 20:06:50 +03:00
hf@deer.(none)
2ba517a3f1 fix for #1210 2003-09-08 13:11:18 +05:00
monty@narttu.mysql.fi
4b3b4b9250 merge 2003-09-03 19:53:08 +03:00
serg@serg.mylan
2317fa3ba5 C cleanups 2003-09-03 16:31:01 +02:00
serg@serg.mylan
7d2b0a0ce7 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-09-03 15:40:19 +02:00
kostja@oak.local
36dd82c1d5 merge commit, hope that none of bar and dlenev changes were 
lost.
 2003-09-03 14:12:10 +04:00
serg@serg.mylan
755455e15c merged 2003-09-03 12:07:18 +02:00
dlenev@mysql.com
73ab4be246 Manual merge fixes 2003-09-01 16:14:54 +04:00
dlenev@dlenev.mshome
2486222cd2 Implemented replication over SSL 
Added proper options to CHANGE MASTER TO, new fields to SHOW SLAVE STATUS,
 Honoring this parameters during connection to master.
 Introduced new format of master.info file
 2003-09-01 15:16:20 +04:00
miguel@hegel.local
234208f03e Fix VC++ compiler error with redifinition return type 2003-08-29 22:13:57 -04:00
monty@narttu.mysql.fi
77a70a0a24 merge with 4.0.15 2003-08-29 13:44:35 +03:00
dlenev@dlenev.mshome
6cad89775b Fixed problem with absence of gmtime_r under Windows. 2003-08-29 03:23:18 +04:00
hf@deer.(none)
bf3e65b128 SCRUM: 
Fixed some mess with STDCALL in function's declarations
 2003-08-28 13:39:46 +05:00
jani@rhols221.adsl.netsonic.fi
5f8ef50b35 Added a warning to my_print_defaults if --verbose is given 
and --defaults-file is a non-existing or non-regular file.
Bug#755
 2003-08-27 19:22:14 +03:00
monty@narttu.mysql.fi
66b160c253 vio ssl structure renames (to get rid of ending _) 
Added TCP/IP read/write timeout for windows
Check on windows if second server is started with same TCP/IP port
 2003-08-27 02:51:39 +03:00
bell@laptop.sanja.is.com.ua
eb3240a908 merge 2003-08-26 16:49:53 +03:00
igor@rurik.mysql.com
40193a7fa5 Manual merge 2003-08-26 00:13:22 -07:00
serg@serg.mylan
58bdc6f5e1 use crc32() from bundled zlib if system zlib is unavailable 2003-08-21 18:30:43 +02:00
monty@narttu.mysql.fi
23f0de0867 Fixed problem with undefined assert symbol 2003-08-20 17:16:07 +03:00
monty@narttu.mysql.fi
359846f052 Fixed some varnings from valgrind 
Set min value of max_allowed_packet to 1024
Fixed problem with UNION's without braces and SQL_CALC_FOUND_ROWS, LIMIT #,#
and ORDER BY...LIMIT
 2003-08-20 16:25:44 +03:00
guilhem@mysql.com
6e32e19047 Use my_b_append instead of my_b_write on a SEQ_READ_APPEND cache, when we write 
the first 4 bytes of the relay log. Indeed comments in mysys/mf_iocache.c 
say we must always use my_b_append for such a cache.
This *could* avoid a very rare assertion failure which is: 
030524 19:32:38  Slave SQL thread initialized, starting replication in log 'FIRST' at position 0, relay log '/
users/gbichot/4.1.1/mysql-test/var/log/slave-relay-bin.000001' position: 4
030524 19:32:38  next log '/users/gbichot/4.1.1/mysql-test/var/log/slave-relay-bin.000002' is currently active
mysqld: mf_iocache.c:701: _my_b_seq_read: Assertion `pos_in_file == info->end_of_file' failed.
and which seemed to happen always when the SQL thread and/or the I/O thread
were at position 4 in a relay log.
 2003-08-19 17:00:36 +02:00
serg@serg.mylan
7b873fa876 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-08-19 11:07:57 +02:00
ram@mysql.r18.ru
ba77af7321 Removed idle MY_LEX_SIGNED_NUMBER 2003-08-19 12:49:47 +05:00
monty@mashka.mysql.fi
10c4acfb4f merge 2003-08-19 00:10:21 +03:00
monty@mashka.mysql.fi
4f7512160b After merge fixes 
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
 2003-08-19 00:08:08 +03:00
monty@mashka.mysql.fi
a9146ace70 Cleanups to recent patches 
Fix packet error when using wrong GRANT command
 2003-08-15 09:54:19 +03:00
serg@serg.mylan
7c5ba4f6fa Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-08-12 19:44:13 +02:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
dlenev@dlenev.mshome
921ac8af8b Implemented UTC_TIME, UTC_DATE and UTC_TIMESTAMP functions (WL#345) 2003-08-11 23:43:01 +04:00
serg@serg.mylan
835e00661d Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-08-09 23:48:57 +02:00
igor@rurik.mysql.com
2813cd1f0b set_var.cc, mysqld.cc, handler.cc, set_var.h, handler.h: 
Added key cache parameters for midpoint insertion strategy
Many files:
  Added midpoint insertion strategy for key cache
mi_test2.c:
  Added a parameter to resize_key_cache
 2003-08-09 11:12:22 -07:00
monty@mashka.mysql.fi
8f08c511ee Review of changesets since last pull. 
(Mostly code cleanups)
 2003-08-07 20:16:37 +03:00
serg@serg.mylan
79922d946a table checksum background: 
my_checksum() mysys function
   NISAM checksum code moved from mysys to isam/ - it's obsolete
   MyISAM checksum code moved to mysys
   table's checksum accessible from sql layer
   SHOW TABLE STATUS shows checksum (WL#646)
code cleanup
 2003-08-05 21:14:15 +02:00
igor@rurik.mysql.com
f7adcbff7b Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2003-08-02 03:27:13 -07:00
igor@rurik.mysql.com
9306f55d8e Many files: 
Added key cache assignment
mi_locking.c:
  Added key cache assignment: correction
my_sys.h:
  Added key cache variable structure
 2003-08-02 02:43:18 -07:00
kostja@oak.local
50d3291aee manual merge 2003-07-31 17:11:52 +04:00
bar@bar.mysql.r18.ru
c2a7768b56 A new separate error message: Unknown collation 'blablabla' 2003-07-29 17:12:14 +05:00
serg@serg.mylan
f384ff5889 ulong is not portable 2003-07-27 10:17:04 +02:00
serg@serg.mylan
e0d9c9cd2b Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-07-27 09:59:24 +02:00
bell@sanja.is.com.ua
9ba680040b added warning about external fields resolving to EXPLAIN command 
(SCRUM) (WL#1053)
 2003-07-25 01:02:42 +03:00
miguel@hegel.local
33c47c7ead Fix for service issue with paths having spaces (bug #687) 2003-07-23 21:57:44 -04:00
hf@deer.(none)
a4f899dfc0 SCRUM - adding client into embedded server 
error handling fixed
fetch_lengths made to work differently in embedded and client cases
 2003-07-23 15:23:20 +05:00
serg@serg.mylan
2cac8f0768 now GRANT db.* ... compares patterns correctly to prevent privilege escalation 2003-07-22 22:21:23 +02:00
hf@deer.(none)
6e9a460182 Another fix for "client code in embedded library" 2003-07-21 16:19:00 +05:00
kostja@oak.local
715f8747d4 few compile-time bugs fixed 2003-07-18 18:57:21 +04:00
kostja@oak.local
09e53b0169 Style fixes, comments for 4.1.1 authorization 
Now special 1-byte packet is used for request of old password
Fixed bug with --skip-grant-tables and acl_getroot
 2003-07-18 18:25:54 +04:00
igor@rurik.mysql.com
26ecd86539 Conflict resolution 2003-07-16 13:35:34 -07:00
igor@rurik.mysql.com
42e1296e9d mi_keycache.c: 
new file
Many files:
  Added CACHE INDEX command
 2003-07-16 12:30:49 -07:00
hf@deer.(none)
6b303f846b Including client code into libmysqld 
Merging
 2003-07-14 16:41:58 +05:00
kostja@oak.local
941a8623ca resolved conflict with pulled changeset 2003-07-09 18:24:43 +04:00
monty@mashka.mysql.fi
8b54bff34c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1
 2003-07-08 23:48:04 +03:00
guilhem@mysql.com
46b0e778b8 Fix for 
BUG#797 "If query ignored on slave (replicate-ignore-table) the slave still checks if
the returned error (0) is the same as the one on the master, whereas it shouldn't
test this.
Plus a new test for BUG#797.
 2003-07-08 15:50:57 +02:00
venu@myvenu.com
bb718b31d0 implementation of mysql_stmt_reset client end 2003-07-08 02:27:21 -07:00
kostja@oak.local
0f28677af6 Merge oak.local:/home/kostja/mysql/mysql-4.1-root 
into oak.local:/home/kostja/mysql/mysql-4.1
 2003-07-08 12:03:46 +04:00
kostja@oak.local
a232225b69 Preliminary support for options --secure-auth, 
--old-passwords
Support for option --old-protocol was removed.
Some test performed.
Tests for SSL and replication are pending.
More strict following to specification for --old-passwords
is in the TODO.
 2003-07-08 02:36:14 +04:00
monty@mashka.mysql.fi
ebcc7b5a4f Support for variables with components 
Added framework to create/drop and manager buffers for multiple key caches
 2003-07-06 19:09:57 +03:00
kostja@oak.local
1d20b23247 Bug fixes for authentication 
OLD_PASSWORD made a keyword to allow set password=old_password('abc') constructions.
 2003-07-04 20:52:04 +04:00
hf@deer.(none)
9d4bae335c Resolving conflicts 2003-07-04 13:21:14 +05:00
hf@deer.(none)
c224b55835 SCRUM 
Including client code into embedded library

Code trimming (fixes of comments etc)
 2003-07-04 11:40:10 +05:00
monty@narttu.mysql.fi
f3af0d7ce4 Status query on killed mysql connection results in segmentation fault (Bug #738) 
Added MAX_PASSWORD_LENGTH. This increased master-slave passwords to 32 bytes (Bug #766)
Fixed server crash on purge master logs or show master logs when binlog is off. (Bug #733)
 2003-07-04 03:18:15 +03:00
monty@narttu.mysql.fi
be22700954 Fix for UNIXWARE 7 
Remove unaligned warnings on Ia64 from client library when using --host
Fix for replication when using many file descriptors
 2003-07-03 19:23:06 +03:00
monty@narttu.mysql.fi
c21728f8c8 Cleaner implementation if INSERT ... SELECT with same tables 
Tests cleanup (put drop database first in tests)
 2003-07-03 11:55:36 +03:00
Sinisa@sinisa.nasamreza.org
c1660e1a23 Lot's of clean-ups and fixes for 4.0.14. 2003-07-02 00:10:47 +03:00
kostja@oak.local
7df0475847 First version of new authentification procedure: now authentification is one-stage (instead of two-stage in 4.1) 
For now following tasks have been done:
- PASSWORD() function was rewritten. PASSWORD() now returns SHA1
  hash_stage2; for new passwords user.password contains '*'hash_stage2; sql_yacc.yy also fixed; 

- password.c: new functions were implemented, old rolled back to 4.0 state

- server code was rewritten to use new authorization algorithm (check_user(), change
  user, and other stuff in sql/sql_parse.cc)

- client code was rewritten to use new authorization algorithm
  (mysql_real_connect, myslq_authenticate in sql-common/client.c)

- now server barks on 45-byte-length 4.1.0 passwords and refuses 4.1.0-style
  authentification. Users with 4.1.0 passwords are blocked (sql/sql_acl.cc)

- mysqladmin.c was fixed to work correctly with new passwords

Tests for 4.0-4.1.1, 4.1.1-4.1.1 (with or without db/password) logons was performed;
mysqladmin also was tested. Additional check are nevertheless necessary.
 2003-07-01 23:40:59 +04:00
venu@myvenu.com
0330f0ccd0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/work/sql/dev-4.1
 2003-07-01 00:30:58 -07:00
venu@myvenu.com
5e65dcb9fb sql_state.h: 
Minor fixups for SQLSTATE values to be compatible with ODBC spec
 2003-07-01 00:30:16 -07:00
igor@rurik.mysql.com
236560e8b3 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2003-06-30 09:53:04 -07:00
igor@rurik.mysql.com
10a8adc1b5 Many files: 
Added multiple key cache
 2003-06-30 09:41:41 -07:00
jani@rhols221.adsl.netsonic.fi
41aa9a026d Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1
 2003-06-27 18:52:09 +03:00
jani@rhols221.adsl.netsonic.fi
541b0d5322 Added support for structured options (WL task ID 947). 2003-06-27 18:51:39 +03:00
bar@bar.mysql.r18.ru
65335d37ff New messages for 3-adic and N-adic operations 
REPLACE() now processed arguments collations according to standard
 2003-06-26 15:45:04 +05:00
monty@narttu.mysql.fi
1bd306ccd4 Fixed some new memory leaks 
Updated VC++ files
 2003-06-24 12:10:35 +03:00
lenz@kallisto.local
873f6d87be - added missing include/sql_state.h to source distribution 2003-06-19 13:46:10 +02:00
hf@deer.(none)
fed7a8d672 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.2way
 2003-06-19 16:38:51 +05:00
hf@deer.(none)
1374a58cf3 SCRUM 
client code added to the embedded library
some fixes
 2003-06-19 16:38:21 +05:00
igor@rurik.mysql.com
f804b783fb Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2003-06-18 23:16:08 -07:00
lenz@kallisto.local
a7f584da79 - added sql-common subdirectory and sql_common.h to source distribution 2003-06-18 23:13:29 +02:00
igor@rurik.mysql.com
5425591503 Merge 2003-06-18 07:31:23 -07:00
hf@deer.(none)
7e1ce534c9 SCRUM 
including client code into embedded server
code to guess what library to use added
net_field_length moved to pack.c
 2003-06-18 15:58:57 +05:00
hf@deer.(none)
b82e89d872 SCRUM 
merged conflicts about my previous commit
it seems there are some errors left - gonna check...
 2003-06-17 21:53:13 +05:00
hf@deer.(none)
c4e3a624b8 SCRUM 
client capabilities included into libmysqld
some API methods became "virtual"
lots of duplicated code removed

IMHO all the above made library's code way more pleasant to look at, didn't it?
 2003-06-17 21:32:31 +05:00
Sinisa@sinisa.nasamreza.org
833e3db2a7 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-06-17 16:24:31 +03:00
heikki@hundin.mysql.fi
4da7f485b7 Many files: 
Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed
 2003-06-15 01:04:28 +03:00
monty@narttu.mysql.fi
1e62d6070a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-06-14 11:38:09 +03:00
monty@narttu.mysql.fi
a1034db4b9 Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 master/slave will now use the 4.1 protocol 
Fixed wrong value for SQLSTATE_LENGTH
Added CLIENT_REMEMBER_OPTIONS to mysql_real_connect()
Changed mysql_port and mysql_unix_port to mysqld_xxxx
 2003-06-14 11:37:42 +03:00
serg@serg.mylan
9f67e10d0d consistency fix - all help texts for command-line options should end with a dot. 2003-06-13 10:59:02 +02:00
monty@narttu.mysql.fi
9e5ec9a5f3 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-06-12 22:40:08 +03:00
monty@narttu.mysql.fi
ecdb1c768c Changed safemalloc structure to not have to be 8 byte aligned. (Portability problem) 2003-06-12 22:39:45 +03:00
serg@serg.mylan
4302bfdb7d typed moved to a proper place 2003-06-12 17:05:45 +02:00
igor@rurik.mysql.com
a0f3dcc3c8 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2003-06-12 06:22:35 -07:00
igor@rurik.mysql.com
f547f2769f Many files: 
New feature: preload indexes into key cache.
mi_preload.c:
  new file
Many files:
  Added preload statement.
 2003-06-12 04:29:02 -07:00
hf@deer.(none)
f5bd6416de Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.2way
 2003-06-09 14:51:40 +05:00
venu@myvenu.com
d764294f12 Fix for mysql_list_fields & reset stmt buffers from stmt_free_result 
Windows build fix
 2003-06-08 09:11:14 -07:00
gluh@gluh.mysql.r18.ru
b68eab61a6 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.revoke
 2003-06-06 17:44:33 +05:00
gluh@gluh.mysql.r18.ru
7d020eae17 REVOKE all privileges and delete user(244) 2003-06-06 17:43:23 +05:00
bar@bar.mysql.r18.ru
eb0727c142 my_global.h: 
ulong was used before the line it have been declared
 2003-06-06 10:50:13 +05:00
monty@narttu.mysql.fi
059b1e5612 After merge fixes 2003-06-05 23:19:56 +03:00
monty@narttu.mysql.fi
7a54334443 Merge with 4.0.13 2003-06-05 17:33:38 +03:00
monty@narttu.mysql.fi
772adcbd99 Print error if we can't delete an alarm 
More debugging variables
Increment aborted_threads in case of killed or too big packet
 2003-06-05 12:29:13 +03:00
monty@narttu.mysql.fi
dad0664579 merge with public tree 2003-06-05 00:12:45 +03:00
monty@narttu.mysql.fi
40109c574a Merge with 4.0.13 2003-06-04 19:21:51 +03:00
monty@narttu.mysql.fi
23145cfed7 Added SQLSTATE to client/server protocol 
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86
 2003-06-04 18:28:51 +03:00
monty@narttu.mysql.fi
100a66e6cb Added [mysqld-base-version] as a default group for the mysqld server 
Portability fix for Windows 64
 2003-06-04 16:05:27 +03:00
hf@deer.(none)
a0d00113e5 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.2way
 2003-06-04 15:13:07 +05:00
hf@deer.(none)
382aba188b SCRUM 
simultaneously usable libraries

unification of client structures
 2003-06-04 15:12:32 +05:00
venu@myvenu.com
c14de0f584 1. Portability fixups for Connector/ODBC 3.52 & DBD 
(Addition of mysql_fetch_column & mysql_stmt_free_result)
 2. Windows build fixups for libmysqld, mysqlbinlog and mysqldemb
 2003-06-04 00:17:48 -07:00
venu@myvenu.com
8f57d0e2e4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/work/sql/dev-4.1
 2003-06-03 18:45:53 -07:00
venu@myvenu.com
27469ec8b9 Windows build fixups with the latest source 2003-06-03 18:45:07 -07:00
hf@deer.(none)
b175a26f44 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.emb_bind
 2003-06-03 15:29:45 +05:00
hf@deer.(none)
9ad3c1cdca SCRUM: 
splittiln common client's parts
 2003-06-03 15:02:57 +05:00
bar@bar.mysql.r18.ru
759214fa41 MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now) 
Some default_charset_info were removed
 2003-06-03 14:59:17 +05:00
Sinisa@sinisa.nasamreza.org
9bd57aa40e Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-06-02 14:14:10 +03:00
monty@narttu.mysql.fi
f6a365a532 Small fixes (nothing nameworthy) 2003-06-01 23:40:01 +03:00
Sinisa@sinisa.nasamreza.org
ec4a0ee477 several bug fixes 2003-05-31 21:35:20 +03:00
hf@deer.(none)
02d3d7e8bd SCRUM: 
Here is another pack of changes about gathering common client code in
sql-common/client.c.
Now i symlink the client.c from sql/ and libmysql/. These directories
have client_settings.h files to be included to client.c. It contains
defines and declarations to compile client.c in appropriate manner.
Also i've added include/sql_common.h, containing declarations of what
is exported from client.c

I removed as many #ifdef-s from client.c as i dared to. I think it's better
push it with some extra #ifdef-s now (of course, if everythihg besides it is
ok) so other people can check the code.
 2003-05-31 15:15:46 +05:00
gluh@gluh.mysql.r18.ru
3317cfdc7d Fix for compiling MySQL-4.0.13 with SSL support on OpenBSD 2003-05-30 18:41:19 +05:00
bar@bar.mysql.r18.ru
67c6703463 --with-collation argument for configure. Now one can for example use this: 
./configure --with-charset=latin1 --with-collation=latin1_danish_ci
 2003-05-28 16:23:04 +05:00
monty@narttu.mysql.fi
eedca52b23 Fix for 64 bit machines (To remove warnings on Itanium) 2003-05-26 19:11:22 +03:00
monty@mashka.mysql.fi
bd4b9522e4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1-narttu
 2003-05-26 19:03:25 +03:00
monty@mashka.mysql.fi
68a159b1fa New 4.1 protocol; SQLSTATE, CLIENT_MULTI_RESULTS, client character set 2003-05-26 19:01:20 +03:00
monty@narttu.mysql.fi
48ecf0e8a7 Fixed core dump bug when shuting down mysqld 2003-05-26 13:10:08 +03:00
bar@bar.mysql.r18.ru
8192d169a2 CHARSET_INFO structure reorganization for easier maintainance 2003-05-23 17:45:52 +05:00
bar@bar.mysql.r18.ru
2b1e1f6494 Variables were rename, binary collation names were added 
Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled
 2003-05-22 17:20:19 +05:00
monty@mashka.mysql.fi
cb7061ebe4 merge 2003-05-22 02:57:27 +03:00
bar@bar.mysql.r18.ru
189d1373b8 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2003-05-21 13:59:00 +05:00
bar@bar.mysql.r18.ru
7f771ce2e1 "character_sets" has been removed from SHOW VARIABLES. Use SHOW CHARACTER SET instead. 
"character_set_system" has been added to display the system character set
 2003-05-21 13:58:30 +05:00
venu@myvenu.com
39cbb547d4 Resolve merge colflict 2003-05-21 00:12:09 -07:00
venu@myvenu.com
08e10a976a Added mysql_fetch_column function 
Added MYSQL_TYPE_NULL as a dummy bind case for fetch buffers
Fix for offset based re-fetch using mysql_fetch_column
Misc cleanups for ODBC compatibility
 2003-05-20 23:41:15 -07:00
bar@bar.mysql.r18.ru
5b788e660a A separate, better error message when it's impossible to aggregate strings for some operation 2003-05-20 16:36:59 +05:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
mysqldev@build.mysql2.com
eb3ba82ec6 my_global.h: 
- QNX 6.2.1 actually defines HAVE_RINT
  - fixed rint(A) #define as it was causing compile errors on QNX
 2003-05-16 13:03:47 +02:00
monty@narttu.mysql.fi
c4d3270460 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-05-13 22:35:41 +03:00
jani@hynda.(none)
c9c5841760 - Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 and 342 
- Fix for QNX: UNIX sockets available since 6.2.1
 2003-05-13 19:34:51 +03:00
monty@narttu.mysql.fi
13530887cb Fix for UNION and LEFT JOIN (Bug #386) 
Fixed wrong logging of Access denied error (Bug #398)
 2003-05-13 18:58:26 +03:00
monty@mashka.mysql.fi
60dfb25be3 Give warning if MySQL doesn't honor given storage engine 
Allow syntax CREATE TABLE t1 (LIKE t2)
 2003-05-13 11:15:11 +03:00
heikki@hundin.mysql.fi
611836e488 my_base.h: 
Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value
 2003-05-07 19:13:56 +03:00
serg@serg.mylan
356b7f62fb count_bits() moved to mysys/ 2003-05-04 18:43:07 +02:00
serg@serg.mylan
f69b6e041c more #ifdef THREAD added 2003-04-30 12:32:43 +02:00
venu@myvenu.com
eb137c063c Support of warnings for all DML statements (Insert, Update and Alter) 
Fix LOAD DATA INFILE warnings to have a better meanigful messages
Fix to make the mysql command line to automatically show the warnings count for all basic commands
 2003-04-30 00:02:28 -07:00
venu@myvenu.com
23a522c026 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/work/sql/dev-4.1
 2003-04-28 22:58:19 -07:00
monty@mashka.mysql.fi
e741c893ea Fix to remove compiler warnings 2003-04-28 19:05:57 +03:00
hf@deer.mysql.r18.ru
d69b5c4d69 SCRUM 
Protocol_cursor task
net_field_length definitions trimmed with Monty's suggestions
 2003-04-28 14:25:29 +05:00
monty@mashka.mysql.fi
dea3a3a88e Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0
 2003-04-28 10:34:34 +03:00
monty@mashka.mysql.fi
51eed4b48c Fix for openssl on Solaris 
Fix for grant bug with SELECT *
 2003-04-28 10:32:56 +03:00
greg@mysql.com
24968f1ee3 Changes from Novell for NetWare platform 2003-04-24 20:48:54 -04:00
monty@narttu.mysql.fi
b228f5ff10 merge 2003-04-24 00:36:48 +03:00
monty@narttu.mysql.fi
f6a43bd567 Fixes for valgrind 
Added optimzation for clustered index
Fixed bug in UPDATE ... ORDER BY
Fixed handling of UPDATE ... LIMIT
 2003-04-23 21:52:16 +03:00
mmatthew@markslaptop.
44c8a1b012 config-win.h: 
Enable 'LOAD LOCAL INFILE', for parity with unix binaries.
 2003-04-23 13:43:31 -05:00
hf@deer.mysql.r18.ru
ca02714715 SCRUM 
Protocol_cursor class and sql-common/ directory
 2003-04-23 19:37:33 +05:00
lenz@mysql.com
767f9a52f0 - added $(SUPERCLEANFILES) to DISTCLEANFILES (bug #201) - thanks to 
Christian Hammers for providing this patch
 2003-04-23 12:44:00 +02:00
venu@myvenu.com
213847281a Fix to return appropriate warnings using SHOW WARNINGS for LOAD DATA INFILE (scrum) 2003-04-22 00:53:07 -07:00
venu@myvenu.com
b2f0a87b81 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/work/sql/dev-4.1
 2003-04-16 12:11:32 -07:00
venu@myvenu.com
077d7e81c8 Fix broken windows distribution workspace file (libmysql.dsp), which is causing VC IDE to crash while loading 
Remove ctype_latin1_de.c from respective dsp files
Fix to make_win_src_distribution.sh to delete all newly added IS Bitkeeper files
 2003-04-16 11:49:52 -07:00
venu@myvenu.com
5cdcbb5782 Added the support of statement result navigation APIs 2003-04-16 00:07:10 -07:00
monty@mashka.mysql.fi
6cf83136af Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1
 2003-04-16 09:26:24 +03:00
monty@mashka.mysql.fi
491589baf8 Add mysys specific error messages 
Make RELAY_THREAD and alias for IO_THREAD
Added new interface for string -> (unsigned) long long.
 2003-04-16 09:25:43 +03:00
monty@mashka.mysql.fi
3e6c350f64 Fixed bug in SUM() with NULL:s 
Added logging of warnings for failed connections with ssl.
Fixed bug in symbolic link handling on Windows
 2003-04-15 22:04:16 +03:00
vva@eagle.mysql.r18.ru
02ad1b95e3 Merge 2003-04-10 10:25:21 -04:00
vva@eagle.mysql.r18.ru
950fa7aa8a added compress/uncompress function 2003-04-09 20:50:30 -04:00
wax@kishkin.ru
8c0de640e3 resolve new updates group_concat 2003-04-02 19:16:19 +06:00
wax@kishkin.ru
74e32241c4 Auto merged 2003-04-02 18:15:16 +06:00
bar@bar.mysql.r18.ru
ca1a736296 mbcharlen() is now used instead of ismbhead(). The last one has been removed. 2003-04-01 15:52:09 +05:00
bar@bar.mysql.r18.ru
0002beb7a4 my_strncasecmp() is not used anymore. Use my_strncoll() instead. 2003-04-01 14:17:28 +05:00
bar@bar.mysql.r18.ru
5b50426f8f Some optimization in CHARSET_INFO: 
We don't need separate hash_sort() and hash_caseup()
  We don't need tosort(). strnxfrm will do the same.
 2003-04-01 12:45:16 +05:00
greg@mysql.com
080b73ee18 Manual merge of Novell's changes for NetWare platform from 4.0, 4.1 patches 2003-03-28 14:24:32 -05:00
monty@mashka.mysql.fi
3bed7a6131 Merge with 4.0.13 2003-03-26 18:37:38 +02:00
greg@mysql.com
a1f9717a4c Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/greg/bk/mysql-4.0
 2003-03-24 21:08:54 -05:00
monty@narttu.mysql.fi
5f5c367361 Fixed bug in allocation memory in key cache. (Memory was not properly aligned which cased core dumps on sparc CPU's) 
Changed keycache variables to start with my_ instead of _my_
 2003-03-25 02:37:41 +02:00
serg@sergbook.mysql.com
6c033b9854 make myisam usable without threads (and even w/o pthread_t) 2003-03-24 11:19:28 +01:00
greg@mysql.com
67985efed5 Post-4.0.12 changes from Novell: mostly NetWare-related code changes to utilize new LibC 2003-03-21 16:45:39 -05:00
greg@mysql.com
6c7b1b2f6a Changes from Novell for various NetWare-only files, post-4.0.12 2003-03-21 15:43:38 -05:00
bar@bar.mysql.r18.ru
682435db72 A separate variable national_charset_info 
Fixes according coercibility tables, p162, SQL Complete
 2003-03-21 11:21:01 +04:00