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
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
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
heikki@hundin.mysql.fi
c2e5f48412
ha_innodb.cc, handler.cc:
...
Fix the BDB crash in the previous push; to save CPU remove duplicate calls of commit in InnoDB
2003-06-05 15:58:23 +03:00
monty@narttu.mysql.fi
4851b571bb
Merged fix for alarm on big blocks
2003-06-05 15:21:10 +03:00
monty@narttu.mysql.fi
de0a3d3036
Fixed test if thr_alarm() failed
2003-06-05 15:15:27 +03:00
jani@ua126d19.elisa.omakaista.fi
9262cf2fb9
Merge jani@192.168.0.2:/my/mysql-4.0
...
into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0
2003-06-05 15:07:28 +03:00
jani@ua126d19.elisa.omakaista.fi
4b55fbe092
Fixed a bug in concat_ws(), which did not add concat separator
...
in case of an empty string. Bug ID 586.
2003-06-05 15:06:19 +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
aeb655e04c
Merge with 3.23 to get fix for thr_alarm and big packets
2003-06-05 12:00:06 +03:00
monty@narttu.mysql.fi
cd3b680db0
Fixed problem with alarms when reading too big packet
2003-06-05 11:55:03 +03:00
monty@narttu.mysql.fi
dad0664579
merge with public tree
2003-06-05 00:12:45 +03:00
monty@narttu.mysql.fi
8ad4a240d2
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-06-04 23:17:45 +03:00
monty@narttu.mysql.fi
f5bb1e0907
After merge fix
2003-06-04 23:17:01 +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
heikki@hundin.mysql.fi
42c80c81f7
handler.cc:
...
If the autocommit is on, let handler.cc commit or rollback the whole transaction at an updating SQL statement end. This probably fixes bug number 578. The problem was that when explicit LOCK TABLES is used, then the lock count method in autocommit does not work.
2003-06-04 17:58:41 +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
venu@myvenu.com
99ceb8fd04
Windows build fixups (Fix for slave_net_timeout)
2003-06-03 22:57:42 -07:00
venu@myvenu.com
45fc8cc25b
Fix windows build after applyiing the changes from new client.c(sql-common)
...
NOTE: Still the build fails to compile core server on Windows due to slave_net_timeout linker error from client.obj
and make sure to have the next changeset, which fixes this.
2003-06-03 20:59:32 -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
guilhem@mysql.com
4a80a6c7b9
One-line fix for bug 576 (DBUG_ASSERT failure when using CHANGE MASTER TO RELAY_LOG_POS=4).
...
Plus a changeset which I had committed but forgot to push (and this changeset is lost on
another computer, so I recreate it here). This changeset is "user-friendly SHOW BINLOG EVENTS
and CHANGE MASTER TO when log positions < 4 are used.
2003-06-03 23:13:06 +02:00
guilhem@mysql.com
3b974039f7
-- Waiting for Monty's approval before push --
...
Bug 571: play LOAD DATA INFILE the same way on the slave as it was on the master:
if it was with IGNORE, do it with IGNORE,
if it was with REPLACE, do it with REPLACE,
and (the change) if it was with nothing, do it with nothing (not with IGNORE !!).
Bug 573: print a proper error message in case of duplicate entry in LOAD DATA INFILE
on the slave, i.e. a message where the keyname and key value appear :
'Duplicate entry '1' for key 1' and not 'Duplicate entry '%-.64s' for key %d'
2003-06-03 15:47:29 +02:00
bar@bar.mysql.r18.ru
514afa7a88
SPACE() is now ucs2 compatible
2003-06-03 18:24:57 +05:00
bar@bar.mysql.r18.ru
1ef8b2e34a
LTRIM, RTRIM and TRIM now honors coercibility
...
LTRIM, RTRIM and TRIM now work fine with ucs2
2003-06-03 16:57:14 +05: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)
5990e7c38e
Obsolete files removed
2003-06-03 15:27:17 +05:00
hf@deer.(none)
f78e0d7ad5
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:03:29 +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
guilhem@mysql.com
4d5ae1d37c
Clearer error message (in the customer's case, the relay log was corrupted,
...
not the master's binlog) (SW 1571).
2003-06-02 17:30:47 +02:00
bar@bar.mysql.r18.ru
7342852dd9
"Collation" has been moved to SHOW FULL FIELDS
...
SHOW COLLATION columns have been removed:
D -> Default
C -> Compiled
Y -> Yes
2003-06-02 17:19:06 +05:00
monty@narttu.mysql.fi
f6a365a532
Small fixes (nothing nameworthy)
2003-06-01 23:40:01 +03:00