dlenev@brandersnatch.localdomain
03b705ff44
Made my_snprintf() behavior snprintf() compatible when printing %x arguments (it should
...
produce hex digits in lower case). (fixed version)
Replaced _dig_vec array with two _dig_vec_upper/_dig_vec_lower arrays.
Added extra argument to int2str function which controls case of digits you get.
Replaced lot of invocations of int2str for decimal radix with more optimized int10_to_str()
function.
Removed unused my_itoa/my_ltoa functions.
2004-05-27 17:54:40 +04:00
marko@hundin.mysql.fi
fc85c80b88
InnoDB cleanup:
...
Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE
Remove (char*) casts of string constants; add const qualifiers
Remove some Hot Backup code unless #ifdef UNIV_HOTBACKUP
2004-05-27 15:27:43 +03:00
hf@deer.(none)
374a28d293
Merging
2004-05-27 16:32:49 +05:00
monty@mysql.com
61a6557307
merge with 4.0 to get windows fixes
2004-05-27 00:30:28 +03:00
monty@mysql.com
dab0b7d415
VC++ portability fix
2004-05-26 21:45:58 +03:00
hf@deer.(none)
78f58ff384
Fix to make Windows compilation smoother
2004-05-26 21:40:27 +05:00
monty@mysql.com
98741a50df
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-05-26 19:13:12 +03:00
monty@mysql.com
7d8f8bc77b
Changed prototype of killed_ptr() to make it more portable
...
Applied patches for Netware
2004-05-26 19:12:49 +03:00
magnus@neptunus.(none)
595cd3f5f1
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/magnus/mysql-4.1
2004-05-26 14:29:53 +02:00
magnus@neptunus.(none)
2daebc70cc
Fix after running on a 4-node system.
2004-05-26 14:22:49 +02:00
monty@mysql.com
390d9898f9
merge with 4.0 to get Netware patches and fixes for libmysqld.dll
2004-05-25 22:54:00 +03:00
monty@mysql.com
ca8dbc24ee
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/tmp/skr99/mysql-4.0
2004-05-25 22:01:50 +03:00
monty@mysql.com
f2e1e3ce4c
Added patches from Novell
2004-05-25 22:00:14 +03:00
konstantin@mysql.com
4eaac5fa56
changed comment for LONG_DATA_COMMAND
2004-05-25 19:52:05 +04:00
magnus@neptunus.(none)
28c8ac884b
Corrected index_flags returned when index are created with USING HASH
...
Updated ndb_ test cases
2004-05-25 14:40:51 +02:00
bar@bar.intranet.mysql.r18.ru
d0c761e66b
sql_string.h:
...
Not used code.
,
sql_string.cc:
Not used code.
2004-05-25 16:05:33 +05:00
bar@bar.intranet.mysql.r18.ru
3f8996f88d
1. Some optimization when conversion is not needed.
...
2. One now must pass length argument into append(const char *str, uint length),
length is not calculated internally anymore.
2004-05-25 15:54:03 +05:00
magnus@neptunus.(none)
2bee88a4c2
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/magnus/mysql-4.1
2004-05-25 12:25:22 +02:00
magnus@neptunus.(none)
4ac5d3bdc1
Uses table_type() function to get name of storage engine before printing engine specific error message.
2004-05-25 12:10:54 +02:00
monty@mysql.com
af44187bff
Merge with 4.0 to get fixes for Windows project files
2004-05-25 02:47:25 +03:00
monty@mysql.com
0babddff40
New MYSQL_SERVER_SUFFIX usage (for easier compilation)
...
Update of VC++ project files.
2004-05-25 02:28:44 +03:00
dlenev@brandersnatch.localdomain
f23af5e6a2
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-macosx
2004-05-25 02:31:15 +04:00
dlenev@brandersnatch.localdomain
a5fab72bc4
Fix for sporadically failures of innodb.test on Darwin 7.3
...
which occured because we were not lowering case of file names
for temporary tables altough handler assumes so if
lower_case_table_names==2. Now we are lowering case for them.
2004-05-25 02:30:09 +04:00
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
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
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
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