mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse source 
into poseidon.(none):/home/tomas/mysql-4.1
This commit is contained in:
unknown 2004-08-19 08:37:45 +00:00
commit 13b0c809ec
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ndb/include/kernel/Interpreter.hpp
View file

@ -83,7 +83,7 @@ public:
static Uint32 LoadConst64(Uint32 Register); // Value in next 2 words
static Uint32 Add(Uint32 DstReg, Uint32 SrcReg1, Uint32 SrcReg2);
static Uint32 Sub(Uint32 DstReg, Uint32 SrcReg1, Uint32 SrcReg2);
static Uint32 Branch(Uint32 Inst, Uint32 R1, Uint32 R2);
static Uint32 Branch(Uint32 Inst, Uint32 Reg1, Uint32 Reg2);
static Uint32 ExitOK();
/**
@ -184,8 +184,8 @@ Interpreter::Sub(Uint32 Dcoleg, Uint32 SrcReg1, Uint32 SrcReg2){
inline
Uint32
Interpreter::Branch(Uint32 Inst, Uint32 R1, Uint32 R2){
return (R1 << 9) + (R2 << 6) + Inst;
Interpreter::Branch(Uint32 Inst, Uint32 Reg1, Uint32 Reg2){
return (Reg1 << 9) + (Reg2 << 6) + Inst;
}
inline

2
ndb/include/util/BaseString.hpp
View file

@ -176,7 +176,7 @@ public:
/**
* Trim string from <i>delim</i>
*/
static char* trim(char * src, const char * delim = " \t");
static char* trim(char * src, const char * delim);
private:
char* m_chr;
unsigned m_len;