mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
12983 commits 2791 branches 343 tags 1.7 GiB
Commit graph

6499 commits

Author SHA1 Message Date
konstantin@mysql.com
f207b33a7b Support for character set conversion in binary protocol: another go 
after Monty's review.
- Item_param was rewritten.
- it turns out that we can't convert string data to character set of
  connection on the fly, because they first should be written to the binary
  log.
  To support efficient conversion we need to rewrite prepared statements
  binlogging code first.
 2004-05-25 02:03:49 +04:00
sergefp@mysql.com
ef260fa754 Merge 2004-05-24 21:13:38 +04:00
sergefp@mysql.com
700adb9ae9 Added support for PREPARE stmt1 FROM @var, 
Fixed the problem of previous patch with replication,
More post-review fixes
 2004-05-24 21:08:22 +04:00
guilhem@mysql.com
50a2d97102 Fix for BUG#3871: a slave must always replicate a statement, even if it examines more than 4G rows, 
so we set SQL_BIG_SELECTS to 1.
 2004-05-24 18:46:49 +02:00
vva@eagle.mysql.r18.ru
1b61cb6d0f Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/TASK_ALTER_INFO/mysql-4.1
 2004-05-24 21:01:35 +05:00
vva@eagle.mysql.r18.ru
e2488c0378 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/TASK_ALTER_INFO/mysql-4.1
 2004-05-24 20:58:57 +05:00
monty@mysql.com
1acbfeafc6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-24 15:59:22 +03:00
monty@mysql.com
eca917b79c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-24 15:00:12 +03:00
dlenev@brandersnatch.localdomain
b6d976e419 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-macosx
 2004-05-24 15:48:53 +04:00
dlenev@brandersnatch.localdomain
0e6217e999 Fix for bug which caused temp_table.test fail on Darwin 7.3 
The code in mysql_create_table() code assumes that if lower_case_names==2 then table alias 
should contain unchanged table name, and this was not true for temporary tables which
had 'tmp-table' constant as alias. Now we are using table name as alias for such tables.
 2004-05-24 15:48:19 +04:00
monty@mysql.com
56c0258536 After merge fixes 
Remove compiler warnings
Update windows project files
 2004-05-24 14:42:34 +03:00
magnus@neptunus.(none)
15023e1b8f Fixed prototype of get_error_message to use String to return error message 
WL#1747 and #1746 allow user to decide if ordered index should be created or not
 2004-05-24 12:35:39 +02:00
hf@deer.(none)
7afbe31db4 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.3691
 2004-05-24 14:49:47 +05:00
hf@deer.(none)
098d8dd01f Fix for bug #3691 (libmysqld reports error 2 on CREATE DATABASE 
but database is created)
handling of CREATE DATABASE errors changed
 2004-05-24 12:23:52 +05:00
serg@serg.mylan
5b4f809706 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-05-23 14:11:10 +02:00
dlenev@brandersnatch.localdomain
c095ce828e Fix for bug which caused grant.test fail on darwin7.3. We were converting db and table 
names to lower case using latin1 instead of utf-8 in sql_acl.cc if lower_case_table_names 
was on. Also replaced in other such places system_charset_info with files_charset_info
for consistency.
 2004-05-22 23:41:58 +04:00
brian@brian-akers-computer.local
fe83735a26 Merge 2004-05-22 12:18:06 -07:00
brian@brian-akers-computer.local
9c84b9b691 Archive merge 2004-05-22 12:16:49 -07:00
brian@brian-akers-computer.local
00bd872d41 Resolving merge issues between archive and most recent changes by Monty/NDB 2004-05-21 10:06:49 -07:00
vva@eagle.mysql.r18.ru
7e93d385d4 Introduced parameter object "ALTER_INFO" for mysql_alter_table 
to make list of parameters in mysql_alter_table shorted
to avoid warning in MSVC (windows) building
 2004-05-21 19:57:03 +05:00
serg@serg.mylan
e21e41fce8 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-05-21 13:29:50 +02:00
serg@serg.mylan
11128fb672 asserting table->file->enable_indexes() in union re-execution 2004-05-21 09:31:28 +02:00
brian@avenger.(none)
467cad0bfc First commit of archive example. Archive is a simple storage engine that handles inserts and selects. 2004-05-20 18:13:11 -07:00
sergefp@mysql.com
f75b1adece Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-05-21 04:31:07 +04:00
sergefp@mysql.com
fb17025b3e WL#1622 "SQL Syntax for Prepared Statements": Post-review fixes (1 of 2) 2004-05-21 04:27:50 +04:00
bell@sanja.is.com.ua
329ac02441 assigning max_length parameter for Item_param (Bug #3811) 2004-05-20 19:08:34 +03:00
ram@gw.mysql.r18.ru
98c10ced6a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b3728
 2004-05-20 14:22:49 +05:00
ram@gw.mysql.r18.ru
f8718e005b A comment for str_to_datetime(). 2004-05-20 14:21:30 +05:00
monty@mysql.com
a4b0ec1ede Merge with 4.0, mainly to get changes to windows project files 2004-05-20 00:54:52 +03:00
sergefp@mysql.com
8e2ff7d135 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/dbdata/psergey/mysql-4.0-root
 2004-05-19 23:20:42 +04:00
bell@sanja.is.com.ua
192eb65e26 after merge fix 2004-05-19 18:13:21 +03:00
bell@sanja.is.com.ua
bd010b1ec3 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1
 2004-05-19 17:09:40 +03:00
bell@sanja.is.com.ua
d42d709171 after review changes 2004-05-19 17:07:28 +03:00
monty@mysql.com
b6188818b1 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-05-19 16:51:03 +03:00
monty@mysql.com
86a966256b Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' 
Ensured that all projects compile
Removed compiler warnings
Better setting of server_version variable.
Fix that make_win_src_distribution creates the privilege tables.
 2004-05-19 16:38:12 +03:00
guilhem@mysql.com
e9c6be0e9d Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-05-19 15:04:01 +02:00
guilhem@mysql.com
319f83ef9b Fix for BUG#3829 "Setting server_id on fly doesn't allow replication to start" 
(fix by our Harrison Fisk): when one does SET GLOBAL SERVER_ID=x, we must set
server_id_supplied to 1.
 2004-05-19 15:03:32 +02:00
pem@mysql.comhem.se
ba749627ae Fixed BUG#3709: SELECT INTO 1 FROM DUAL not parsed as expected 
Made the combination of INTO and FROM DUAL work, e.g.
SELECT 1 INTO @x FROM DUAL.
As a consequence, DUAL is made a reserved word. It would work to not have
it reserved, but it was deemed to be confusing as a user defined table by
the same name then must be qualified with a db (schema).
 2004-05-19 14:51:41 +02:00
konstantin@mysql.com
e13e9288c9 Fix for Bug#3754 "SET GLOBAL myisam_max_sort_file_size doesn't 
work as expected": precision-losing conversion removed from 
sys_var_thd_ulonglong.
 2004-05-19 16:42:29 +04:00
hf@deer.(none)
af39bd4125 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.ps
 2004-05-19 10:28:24 +05:00
monty@mysql.com
332f124bc6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-19 05:09:41 +03:00
monty@mysql.com
21f1bca789 Portability fixes 
Fixed wrong number of warnings/duplicates for machines with high-byte-first
 2004-05-19 05:09:10 +03:00
sergefp@mysql.com
8becc50685 Fix for BUG33649: Post-review fixes 2004-05-19 02:18:54 +04:00
sergefp@mysql.com
482058befa Fix and test case for BUG#3649. 2004-05-18 22:59:43 +04:00
brian@brian-akers-computer.local
fdaf6d4221 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2004-05-18 09:56:41 -07:00
brian@brian-akers-computer.local
bab1dc82c7 Updating range_in_rows for the include file for ha_example (the main .cc file has already been updated). 2004-05-18 09:54:36 -07:00
hf@deer.(none)
3a7e3f0612 embedded library: fix for sending of parameters to stored procedure. 
using of methods like sint2korr() doesn't work on Bigendian machines
 2004-05-18 19:13:21 +05:00
ram@gw.mysql.r18.ru
fdc0f0e781 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3756
 2004-05-18 13:56:40 +05:00
serg@serg.mylan
d9a6ff1125 don't try to purge closed logs 2004-05-18 10:29:20 +02:00
ram@gw.mysql.r18.ru
0f3ab4174e A fix (Bug #3728: Missing warning in 4.1). 2004-05-18 12:16:00 +05:00