Commit graph

7675 commits

Author SHA1 Message Date
monty@narttu.mysql.fi
3ec97824b7 Change dbug.h -> my_dbug.h (Portability fix)
Ensure that \ is not allowed in filenames, even on Unix
2003-03-17 19:06:14 +02:00
Sinisa@sinisa.nasamreza.org
c2cde48001 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-03-17 15:53:43 +02:00
jani@hynda.(none)
5eddd40bc9 Fixed a bug in --one-database. 2003-03-17 15:50:56 +02:00
bar@bar.mysql.r18.ru
c7b3eeb178 sql_show.cc:
Bug fix
  0 stayed for length here, now it is charset.
2003-03-17 17:30:34 +04:00
Sinisa@sinisa.nasamreza.org
2ebfb836ab A fix for a bug reported by Per Erik Martin, partaining to
usage of expressions whose result are to be saved into user vars.
2003-03-17 15:16:26 +02:00
monty@narttu.mysql.fi
5dd970c335 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-03-17 15:06:06 +02:00
monty@narttu.mysql.fi
e7288f279e After merge fixes
Don't create temporary objects with no table name
2003-03-17 15:05:04 +02:00
bar@bar.mysql.r18.ru
63a307bb38 sql_string.cc:
Copy as is if src or dst are binary
2003-03-17 13:40:40 +04:00
bar@bar.mysql.r18.ru
caf31a0790 Preparing to client<->server autoconvert 2003-03-17 13:14:04 +04:00
bar@bar.mysql.r18.ru
e00c9fa7d5 sql_select.cc:
binary comparing alway must be used, because sort_string() is executed for textual data.
2003-03-17 10:47:08 +04:00
monty@narttu.mysql.fi
a434bca704 Merge with 4.0 2003-03-16 19:17:54 +02:00
monty@mashka.mysql.fi
ce7db2827e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2003-03-16 16:34:55 +02:00
monty@mashka.mysql.fi
ba46c7289c Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-03-16 16:30:54 +02:00
monty@mashka.mysql.fi
b879a40120 Write binlog before commit when doing INSERT ... SELECT 2003-03-16 16:28:30 +02:00
monty@mashka.mysql.fi
d9dfba6e5c Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23
2003-03-16 16:26:59 +02:00
mysql@home.(none)
c6efa7a8b7 New function my_charset_same() 2003-03-16 17:19:24 +04:00
heikki@hundin.mysql.fi
852b1b3dc5 row0mysql.c:
Test if merging from 3.23 to 4.0 succeeds
2003-03-16 14:40:41 +02:00
root@home.(none)
5c6c54c09a system_charset_info has been moved to /sql directory
and isn't used in libraries any longer
2003-03-16 12:30:10 +04:00
root@home.(none)
1daed63ed8 mysqltest.c, mysqlimport.c, mysqldump.c, mysqlcheck.c, mysql.cc:
system_charset_info was removed
2003-03-16 11:20:45 +04:00
heikki@hundin.mysql.fi
1573226e69 trx0roll.c:
Fix compiler warning in Windows about ib_longlong to ulint conversion
2003-03-16 09:01:47 +02:00
root@home.(none)
f71a7e4b05 set_default_charset() is not used anymore
Some system_charset_info were removed
2003-03-16 10:56:14 +04:00
heikki@hundin.mysql.fi
008e1d29a3 row0sel.c:
Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal
2003-03-15 20:05:55 +02:00
heikki@hundin.mysql.fi
c4370278a0 row0sel.c:
Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal
2003-03-15 20:05:03 +02:00
lenz@mysql.com
efbb9d45c1 - fixed C++-style comments to make IBM C compiler happy 2003-03-15 18:42:55 +01:00
bar@bar.mysql.r18.ru
dfe65d3281 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-15 17:25:41 +04:00
bar@bar.mysql.r18.ru
59f6e35cf6 sql_parse.cc, sql_db.cc:
less system_charset_info
2003-03-15 17:24:21 +04:00
bell@sanja.is.com.ua
1a8227d1c1 Merge 2003-03-15 14:16:57 +02:00
bell@sanja.is.com.ua
1e733bb8ab Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/mysql-4.1
2003-03-15 13:35:40 +02:00
lenz@mysql.com
81db1e7fa2 - tagged ChangeSet 1.1358 as mysql-3.23.56
- bumped up version number to 3.23.57 in configure.in
2003-03-15 12:35:09 +01:00
bar@bar.mysql.r18.ru
d09f865d4f sql_lex.cc:
Use LEX charset instead of system one
2003-03-15 15:19:06 +04:00
bell@sanja.is.com.ua
65fe679d91 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1
2003-03-15 13:04:34 +02:00
serg@serg.mysql.com
15dbe91a6e fixed typo (double ++ in assert)
removed all side effects from asserts for not to confuse casual reader
2003-03-15 11:56:03 +01:00
bell@sanja.is.com.ua
587196984d Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1
2003-03-15 11:24:44 +02:00
monty@mashka.mysql.fi
968e9a73d4 merge with 3.23 to get:
- Fix for empty table/column names
2003-03-15 04:41:57 +02:00
monty@mashka.mysql.fi
a6482b1304 Code cleanup 2003-03-15 04:34:06 +02:00
monty@mashka.mysql.fi
369da47836 Code cleanup 2003-03-14 23:06:55 +02:00
serg@serg.mysql.com
15ff383e20 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2003-03-14 20:25:50 +01:00
serg@serg.mysql.com
9749ece292 cleanup 2003-03-14 20:22:06 +01:00
lenz@mysql.com
0830fbcced Merge build:/home/bk/mysql-4.0
into mysql.com:/Users/mysqldev/my/mysql-4.0
2003-03-14 20:08:13 +01:00
venu@myvenu.com
88df7b695b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-03-14 10:44:08 -08:00
venu@myvenu.com
3f7e4239a2 Fix for not to assert in DBUG mode when the result type is INT24 as data is sent in INT32 format
(normal protocol only, prepared protocol already handles it)
2003-03-14 10:35:13 -08:00
monty@mashka.mysql.fi
2cb3a5d264 Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23
2003-03-14 17:11:38 +02:00
monty@mashka.mysql.fi
5ee1dbbe58 Check for empty table/column names 2003-03-14 17:08:42 +02:00
guilhem@mysql.com
7092bbe8a4 Small fixes in mysql_tableinfo. It's only code tiny changes, does not modify
the output of the script.
2003-03-14 16:07:15 +01:00
monty@mashka.mysql.fi
8887929a66 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2003-03-14 17:03:42 +02:00
bar@bar.mysql.r18.ru
26e6fb0e24 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-14 18:11:20 +04:00
bar@bar.mysql.r18.ru
b009386fa4 Every charset now have its own parser state arrays 2003-03-14 18:08:12 +04:00
lenz@mysql.com
8066830f00 - we need to require an installation on the root volume (/usr/local/mysql) 2003-03-14 14:17:56 +01:00
bell@sanja.is.com.ua
50d3fc7d43 fixed uncachable union (bug #150) 2003-03-14 14:16:09 +02:00
hf@genie.(none)
dbfaa445e0 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/hf/work/mysql-4.1.lck
2003-03-14 13:12:04 +04:00