mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 07:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
8745 commits 2776 branches 343 tags 1.6 GiB
Commit graph

4242 commits

Author SHA1 Message Date
lenz@mysql.com
8f4794822f Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2003-06-19 12:19:28 +02:00
lenz@kallisto.local
1908cc62b6 - revert wrong include of zlib.h as zlib is not part of the source 
distribution - better use -I../zlib where appropriate (usually we use
   the zlib installed in the system)
 2003-06-19 12:18:04 +02:00
igor@rurik.mysql.com
63691e27a2 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2003-06-19 02:42:49 -07:00
igor@rurik.mysql.com
98eeaa54f3 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2003-06-19 02:39:46 -07:00
igor@rurik.mysql.com
3ed12d5a74 preload.result, preload.test: 
Removed non-generic info (key used blocks)
preload.result, preload.test, lex.h, sql_yacc.yy:
  Syntax change for preload statement
 2003-06-19 02:34:33 -07:00
bar@bar.mysql.r18.ru
069e57bd2f Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2003-06-19 13:13:40 +05:00
bar@bar.mysql.r18.ru
ebb88ec6ea LPAD, RPAD, MAKE_SET and EXPORT_SET now works correctly with collations 2003-06-19 13:12:55 +05:00
igor@rurik.mysql.com
5a6d0da277 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2003-06-19 00:01:16 -07:00
bar@bar.mysql.r18.ru
69af692a5c These functions now return a result of proper collation: 
BIN
OCT
CONV
HEX
CHAR
FORMAT
REPLACE
 2003-06-19 11:36:44 +05: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)
66ecacb3c3 Last part of resolving conflicts after pull 
Some intersections with Monty encountered
 2003-06-18 10:34:09 +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
c53202b1d7 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-06-17 16:25:22 +03:00
bar@bar.mysql.r18.ru
319124508a The default collation for cp1251 has been changed to general_ci 2003-06-17 18:10:35 +05:00
serg@serg.mylan
0d02b972db Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-06-16 00:13:25 +02:00
monty@narttu.mysql.fi
c1f1107b2a Add missing defines 2003-06-16 01:13:24 +03:00
serg@serg.mylan
7a08f3653b bad merge fixed 2003-06-16 00:13:23 +02:00
monty@narttu.mysql.fi
e090f2d0cc Fixes for make_win_src_distributions 
Removed compiler warnings
 2003-06-15 23:24:37 +03:00
monty@narttu.mysql.fi
d33cb08eb6 LAST_INSERT_ID()}will now return 0 if the last INSERT didn't insert any rows. 2003-06-15 12:34:04 +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
002d842012 bug #251 - destroyed object reused - fixed 2003-06-13 23:00:04 +02:00
serg@serg.mylan
041b0819c2 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-06-13 22:37:14 +02: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
igor@rurik.mysql.com
1f23812865 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2003-06-12 08:40:48 -07:00
guilhem@mysql.com
cd36523784 See each file's changeset for details. 
- Comments for future devs.
- Start_log_event::exec_event() : when we hit it, do a rollback.
- We don't need LOG_EVENT_FORCED_ROTATE_F.
- Stop_log_event::exec_event() : when we hit it, we needn't clean anything.
- Removed LOG_EVENT_TIME_F and LOG_EVENT_FORCED_ROTATE_F.
- We don't need Stop events in the relay log.
- Now filtering of server id is done in the I/O thread first.
 2003-06-12 16:20:31 +02:00
Sinisa@sinisa.nasamreza.org
0791fe35b6 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-06-12 16:53:37 +03:00
Sinisa@sinisa.nasamreza.org
862506b6af Derived tables bug fix ....... 2003-06-12 16:52:36 +03: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
guilhem@mysql.com
4b2fa4ea22 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2003-06-11 17:13:40 +02:00
guilhem@mysql.com
e04a9e6740 We now require SUPER privilege for SET PSEUDO_THREAD_ID. 2003-06-11 17:07:33 +02:00
serg@serg.mylan
8b38d261a3 protect deleted objects from reusal with safemalloc technique 2003-06-11 13:32:50 +02:00
carsten@tsort.bitbybit.dk
bb8b0d9d76 Merge cpedersen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into tsort.bitbybit.dk:/home/carsten/mysql/bk/mysql-4.1
 2003-06-10 15:56:58 +02:00
bar@bar.mysql.r18.ru
22a7449c7c LOAD_FILE() is now COERCIBLE 
LOAD_FILE() tests
 2003-06-10 17:53:06 +05:00
Sinisa@sinisa.nasamreza.org
19a17f602f Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-06-10 15:21:19 +03:00
bar@bar.mysql.r18.ru
5b9db52966 Function INSERT() now works according to coercibility rules 
Test for INSERT() has been added
 2003-06-10 16:41:42 +05:00
bar@bar.mysql.r18.ru
3d08cfecd4 Some more functions work according to coercibility now: 
repeat, reverse, quote, soundex, substring
Test func_str has been extended to check them
 2003-06-10 14:54:03 +05:00
carsten@tsort.bitbybit.dk
725d5fdc43 Some error messages re. BLOBs are true for TEXTs as well 2003-06-09 15:22:28 +02:00
wax@kishkin.ru
ed02be687c Merge kishkin.ru:/home/wax/mysql-4.1 into kishkin.ru:/home/wax/mysql-4g 2003-06-07 02:28:11 +06: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
monty@narttu.mysql.fi
0303cd572f Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-06-05 23:19:55 +03:00
vva@eagle.mysql.r18.ru
27cbc507fa fixed bug (writting outside mallocced buffer in sql_help.cc) 2003-06-05 16:19:54 -04:00
monty@narttu.mysql.fi
7a54334443 Merge with 4.0.13 2003-06-05 17:33:38 +03:00
jani@ua126d19.elisa.omakaista.fi
d793db2bb9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0
 2003-06-05 16:57:36 +03:00
jani@ua126d19.elisa.omakaista.fi
058d8ed14b mysqld won't give a warning any more, if --user=user_name is used, 
if 'user_name' is the current user and it is not root.
 2003-06-05 16:56:38 +03:00
heikki@hundin.mysql.fi
e09517e2ac ha_innodb.cc: 
Revert a change to dict_mem_index_add_field which slipped prematurely into the bk tree
 2003-06-05 16:06:38 +03:00