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
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
marko@hundin.mysql.fi
40711b570a
InnoDB cleanup: Remove unused functions ut_sprintf() and ut_fprintf()
2004-05-20 01:32:02 +03: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
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
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
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
jani@a80-186-24-72.elisa-laajakaista.fi
09f5f1edf2
Fixed a bug in mysql-copy-right-2 script. As it was, it destroyed some ndb source
...
files, such as ha_ndbcluster.cc
2004-05-18 17:26:49 +03: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
serg@serg.mylan
d9a6ff1125
don't try to purge closed logs
2004-05-18 10:29:20 +02:00
serg@serg.mylan
d9ec0f2b90
after merge fix
2004-05-18 09:56:45 +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
serg@serg.mylan
7961968ada
current_thd is 0 if ha_resolve_by_name() is called when parsing command-line options
2004-05-17 18:45:59 +02:00
hf@deer.(none)
bbfe390afd
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.ps
2004-05-17 18:45:50 +05:00
marko@hundin.mysql.fi
e58b9c62fb
InnoDB cleanup: Remove unused function ut_printf()
2004-05-17 14:51:46 +03:00
marko@hundin.mysql.fi
fff422724d
Merge marko@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-05-17 14:41:37 +03:00
marko@hundin.mysql.fi
03f19377a9
InnoDB cleanup: Add const qualifiers to many char* arguments
2004-05-17 14:40:31 +03:00
Sinisa@sinisa.nasamreza.org
8eadb1809d
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-05-17 13:47:51 +03:00
serg@serg.mylan
eb93657507
typo fixed
2004-05-17 11:10:22 +02:00
serg@serg.mylan
b269d4ad21
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-05-17 11:05:19 +02:00
serg@serg.mylan
bc71d98a03
bug#3681 - order by, distinct, refer to aliased field by name
...
check for field_name (not only for name) in find_item_in_list, to be compatible with item->eq() that is done later
2004-05-17 11:04:12 +02:00
monty@mysql.com
3f5ce7bd25
After merge fixes
2004-05-17 11:22:30 +03:00
monty@mysql.com
cd3dab49cc
Merge with 4.0.20
2004-05-17 01:52:13 +03:00
monty@mishka.local
a79a3f5724
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2004-05-16 14:49:32 +03:00
monty@mishka.local
314a8bf114
key_cmp -> key_cmp_if_same
...
New records_in_range() interface (similar to read_range())
Macros for faster bitmap handling
Simplify read_range() code (#WL1786)
New general key_cmp() function to compare keys
2004-05-16 14:48:32 +03:00
Sinisa@sinisa.nasamreza.org
2d656181dc
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-05-15 18:30:04 +03:00
Sinisa@sinisa.nasamreza.org
0806214620
Optimising UNION ALL (WL 1687)
2004-05-15 16:13:08 +03:00
hf@deer.(none)
e18cd2ea9f
Fixes for #3371 , #3372 , #3374 , #3375 , #3376
2004-05-15 17:07:44 +05:00
serg@serg.mylan
0dc8aacf7d
merged
2004-05-15 11:26:58 +02:00
serg@serg.mylan
da63a927f2
bad old merge fixed
2004-05-15 11:20:42 +02:00
monty@mysql.com
9f171e7794
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-05-15 11:58:08 +03:00
monty@mysql.com
e0a4b51215
Better fix for bug #3749 (bug in deleting automatic generated foreign keys)
2004-05-15 11:57:40 +03:00
bell@sanja.is.com.ua
a785d16d8a
results fix
2004-05-15 11:20:43 +03:00
bell@sanja.is.com.ua
693b075e50
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any2-4.1
2004-05-15 10:15:44 +03:00
monty@mysql.com
1e860400f3
Extra safety fixes (probably not needed, but can't hurt)
2004-05-15 09:08:03 +03:00
guilhem@mysql.com
7bcb79e76b
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-05-14 23:09:03 +02:00
guilhem@mysql.com
a039062ef3
Replication testsuite: making the master-slave synchronization less likely to fail,
...
by adding sleep-and-retries (max 4 times) if MASTER_POS_WAIT() returns NULL
in sync_with_master and sync_slave_with_master.
The problem showed up only today, in MySQL 5.0 in rpl_server_id2.test,
but may affect 4.x as well, so fixing it here. Note that I am also fixing
5.0 too, with the same exact patch, because I don't want to leave 5.0 broken
until the next 4.0->4.1->5.0 merge.
2004-05-14 23:08:03 +02:00
serg@serg.mylan
6a594c07c5
get rid of remaining strtolls - irix64 compatibility
2004-05-14 19:12:09 +02:00
hf@deer.(none)
e81c6e1763
CXX linker specified for client_test with libmysqld
2004-05-14 21:00:29 +05:00
bell@sanja.is.com.ua
712d379b5e
check of item name presence in find_item_in_list (Bug #3752 )
2004-05-14 18:55:24 +03:00
bell@sanja.is.com.ua
9432158831
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any2-4.1
2004-05-14 16:57:21 +03:00
bell@sanja.is.com.ua
38d0d362c5
SELECT options print fixed
2004-05-14 16:56:47 +03:00
heikki@hundin.mysql.fi
02f51ccf2d
Many files:
...
Fix remaining cases of Bug #3596 : fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
2004-05-14 16:48:56 +03:00
marko@hundin.mysql.fi
a4489d39b5
Merge marko@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-05-14 16:07:21 +03:00